summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-05-31 21:26:18 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-05-31 21:26:18 +0000
commit70b81e65cceb83b8933c7da7bdae2ce709404998 (patch)
treea9415ac980bd144dfd08e9eda41b8d6066de47e0 /android
parent1aadfb2229d7105d19d321079acaede1e4f63a3f (diff)
downloadrockbox-70b81e65cceb83b8933c7da7bdae2ce709404998.tar.gz
rockbox-70b81e65cceb83b8933c7da7bdae2ce709404998.tar.bz2
rockbox-70b81e65cceb83b8933c7da7bdae2ce709404998.zip
Android: install codecs as native libs instead of extracting them (FS#12134).
Codec files are loaded as dynamic libraries. Instead of extracting them from the packaged libmisc.so and therefore having them present twice on the device put them into the apk as native libraries. Decreases the size of the installed Rockbox by the compressed size of the codecs. Also, the extraction on first Rockbox startup gets notably faster since it's less data to extract. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29940 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android')
-rw-r--r--android/android.make4
1 files changed, 4 insertions, 0 deletions
diff --git a/android/android.make b/android/android.make
index fa3b48eaf8..f12b79750d 100644
--- a/android/android.make
+++ b/android/android.make
@@ -46,6 +46,7 @@ JAVA_OBJ := $(call java2class,$(subst $(ANDROID)/src/$(PACKAGE_PATH),$(ANDROID)/
LIBS := $(BINLIB_DIR)/$(BINARY) $(BINLIB_DIR)/libmisc.so
+LIBS += $(addprefix $(BINLIB_DIR)/lib,$(patsubst %.codec,%.so,$(notdir $(CODECS))))
TEMP_APK := $(BUILDDIR)/bin/_rockbox.apk
TEMP_APK2 := $(BUILDDIR)/bin/__rockbox.apk
DEX := $(BUILDDIR)/bin/classes.dex
@@ -107,6 +108,9 @@ $(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY)
$(BINLIB_DIR)/libmisc.so: $(BUILDDIR)/rockbox.zip
$(call PRINTS,CP rockbox.zip)cp $^ $@
+$(BINLIB_DIR)/lib%.so: $(BUILDDIR)/apps/codecs/%.codec
+ $(call PRINTS,CP $(@F))cp $^ $@
+
libs: $(LIBS)
$(TEMP_APK): $(AP_) $(LIBS) $(DEX) | $(DIRS)