diff options
Diffstat (limited to 'android')
-rw-r--r-- | android/README | 20 | ||||
-rw-r--r-- | android/android.make | 11 |
2 files changed, 14 insertions, 17 deletions
diff --git a/android/README b/android/README index 6c9d2ad4c6..8f0a85cabb 100644 --- a/android/README +++ b/android/README | |||
@@ -16,22 +16,20 @@ compiling the java files will fail. | |||
16 | 16 | ||
17 | * Build instructions | 17 | * Build instructions |
18 | 18 | ||
19 | Use this as your build folder, using '../tools/configure' etc. | 19 | 1. Create a separate build folder. Do not build in this source directory. |
20 | $ ../tools/configure # type 200, then chose A for android and your screen resolution | ||
21 | $ make | ||
22 | 20 | ||
21 | 2. Run "../tools/configure". Choose target 200, then chose 'A' for Android | ||
22 | and input your screen resolution. | ||
23 | 23 | ||
24 | After the build finished, build the zip file which contains codecs and themes (the binary is a separate file): | 24 | 3. Run "make" |
25 | $ make zip | ||
26 | 25 | ||
27 | Once you have the zip, pack it and the binary into the apk | 26 | 4. Run "make zip". This has to be run the first time, and any time themes |
28 | $ make apk | 27 | or plugins have changed. Otherwise you may skip it. |
29 | 28 | ||
30 | Side note: You don't necessarily need to recreate the zip once you have it, only if you're unsure or if you know its content changed. | 29 | 5. Run "make apk" |
31 | Not recreating it will save time because it's only unzipped on the device if it's newer than what's on the device | ||
32 | 30 | ||
33 | You can install that on your device or emulator with the following command: | 31 | 6. Optional. Install on your target/emulator, using the following command: |
34 | $ $ANDROID_SDK_PATH/tools/adb install -r bin/Rockbox.apk | 32 | "$ANDROID_SDK_PATH/tools/adb install -r rockbox.apk" |
35 | 33 | ||
36 | 34 | ||
37 | [1]: http://developer.android.com/sdk/index.html | 35 | [1]: http://developer.android.com/sdk/index.html |
diff --git a/android/android.make b/android/android.make index f611d5d5a1..492c0127cb 100644 --- a/android/android.make +++ b/android/android.make | |||
@@ -41,11 +41,11 @@ JAVA_SRC := $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/*.java) | |||
41 | JAVA_OBJ := $(call java2class,$(subst $(ANDROID)/src/$(PACKAGE_PATH),$(ANDROID)/bin/$(PACKAGE_PATH),$(JAVA_SRC))) | 41 | JAVA_OBJ := $(call java2class,$(subst $(ANDROID)/src/$(PACKAGE_PATH),$(ANDROID)/bin/$(PACKAGE_PATH),$(JAVA_SRC))) |
42 | 42 | ||
43 | LIBS := $(BINLIB_DIR)/$(BINARY) $(BINLIB_DIR)/libmisc.so | 43 | LIBS := $(BINLIB_DIR)/$(BINARY) $(BINLIB_DIR)/libmisc.so |
44 | TEMP_APK := $(BUILDDIR)/bin/_Rockbox.apk | 44 | TEMP_APK := $(BUILDDIR)/bin/_rockbox.apk |
45 | TEMP_APK2 := $(BUILDDIR)/bin/__Rockbox.apk | 45 | TEMP_APK2 := $(BUILDDIR)/bin/__rockbox.apk |
46 | DEX := $(BUILDDIR)/bin/classes.dex | 46 | DEX := $(BUILDDIR)/bin/classes.dex |
47 | AP_ := $(BUILDDIR)/bin/resources.ap_ | 47 | AP_ := $(BUILDDIR)/bin/resources.ap_ |
48 | APK := $(BUILDDIR)/bin/Rockbox.apk | 48 | APK := $(BUILDDIR)/rockbox.apk |
49 | 49 | ||
50 | _DIRS := $(BUILDDIR)/___/$(PACKAGE_PATH) | 50 | _DIRS := $(BUILDDIR)/___/$(PACKAGE_PATH) |
51 | DIRS := $(subst ___,bin,$(_DIRS)) | 51 | DIRS := $(subst ___,bin,$(_DIRS)) |
@@ -53,6 +53,8 @@ DIRS += $(subst ___,gen,$(_DIRS)) | |||
53 | DIRS += $(subst ___,data,$(_DIRS)) | 53 | DIRS += $(subst ___,data,$(_DIRS)) |
54 | DIRS += $(BUILDDIR)/libs/armeabi | 54 | DIRS += $(BUILDDIR)/libs/armeabi |
55 | 55 | ||
56 | CLEANOBJS += bin gen libs data | ||
57 | |||
56 | $(R_JAVA) $(AP_): $(MANIFEST) | 58 | $(R_JAVA) $(AP_): $(MANIFEST) |
57 | $(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \ | 59 | $(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \ |
58 | -J $(BUILDDIR)/gen -M $(MANIFEST) -S $(ANDROID_DIR)/res \ | 60 | -J $(BUILDDIR)/gen -M $(MANIFEST) -S $(ANDROID_DIR)/res \ |
@@ -106,6 +108,3 @@ $(DIRS): | |||
106 | dirs: $(DIRS) | 108 | dirs: $(DIRS) |
107 | 109 | ||
108 | apk: $(APK) | 110 | apk: $(APK) |
109 | |||
110 | clean:: | ||
111 | $(SILENT)rm -f $(BUILDDIR)/bin/$(PACKAGE_PATH)/*.class $(R_JAVA) $(TEMP_APK) $(TEMP_APK2) $(APK) $(DEX) $(BUILDDIR)/_rockbox.zip $(AP_) $(LIBS) | ||