diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-09-22 20:50:06 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-09-22 20:50:06 +0000 |
| commit | 55d70363bd64a48fedca12ecdfdb436161ba83c4 (patch) | |
| tree | 776908270a262bc4a7d3fa871009d670c7dc0ff9 /android | |
| parent | 3013103249ce3f893e7ff34edcd53501d7ce5444 (diff) | |
| download | rockbox-55d70363bd64a48fedca12ecdfdb436161ba83c4.tar.gz rockbox-55d70363bd64a48fedca12ecdfdb436161ba83c4.zip | |
Android port: Remove the "make zip" dependency of make apk again (see r28068).
It was reintroduced in r28138.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28141 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android')
| -rw-r--r-- | android/README | 9 | ||||
| -rw-r--r-- | android/android.make | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/android/README b/android/README index 2b1bd2ab6c..6c9d2ad4c6 100644 --- a/android/README +++ b/android/README @@ -20,9 +20,16 @@ Use this as your build folder, using '../tools/configure' etc. $ ../tools/configure # type 200, then chose A for android and your screen resolution $ make -After the build finished, build the apk file: + +After the build finished, build the zip file which contains codecs and themes (the binary is a separate file): + $ make zip + +Once you have the zip, pack it and the binary into the apk $ make apk +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. +Not recreating it will save time because it's only unzipped on the device if it's newer than what's on the device + You can install that on your device or emulator with the following command: $ $ANDROID_SDK_PATH/tools/adb install -r bin/Rockbox.apk diff --git a/android/android.make b/android/android.make index 8cb52bbbba..ed39973165 100644 --- a/android/android.make +++ b/android/android.make @@ -78,9 +78,7 @@ dex: $(DEX) $(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY) $(call PRINTS,CP $(BINARY))cp $^ $@ -$(BUILDDIR)/rockbox.zip: zip - -$(BINLIB_DIR)/libmisc.so: $(BUILDDIR)/rockbox.zip +$(BINLIB_DIR)/libmisc.so: $(call PRINTS,CP rockbox.zip)cp $^ $@ libs: $(LIBS) |