From 90f47c7b1d9725c13d972a0e2a61b2cd966bbab5 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sat, 9 Apr 2011 18:28:02 +0200
Subject: ANDOID: Replace mkmanifest.pl with sh/sed code

Removes build dependencies like perl and its XML modules
---
 backends/platform/android/android.mk | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'backends/platform/android')

diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 01ebf73a81..fdb0f8096a 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -110,14 +110,13 @@ $(FILE_DEX_PLUGIN): $(CLASSES_PLUGIN)
 	@$(MKDIR) -p $(@D)
 	$(DX) --dex --output=$@ $(PATH_BUILD_CLASSES_PLUGIN_TOP)
 
-$(PATH_BUILD)/%/AndroidManifest.xml $(PATH_STAGE_PREFIX).%/res/values/strings.xml: $(PATH_DIST)/mkmanifest.pl $(srcdir)/configure $(PATH_DIST)/AndroidManifest.xml
-	$(PATH_DIST)/mkmanifest.pl --id=$* --configure=$(srcdir)/configure \
-		--version-name=$(VERSION) \
-		--version-code=$(ANDROID_PLUGIN_VERSIONCODE) \
-		--stringres=$(PATH_STAGE_PREFIX).$*/res/values/strings.xml \
-		--manifest=$(PATH_BUILD)/$*/AndroidManifest.xml \
-		--master-manifest=$(PATH_DIST)/AndroidManifest.xml \
-		--unpacklib=mylib/armeabi/lib$*.so
+$(PATH_BUILD)/%/AndroidManifest.xml: $(PATH_DIST)/mkplugin.sh $(srcdir)/configure $(PATH_DIST)/plugin-manifest.xml
+	@$(MKDIR) -p $(@D)
+	$(PATH_DIST)/mkplugin.sh $(srcdir)/configure $* $(PATH_DIST)/plugin-manifest.xml $(ANDROID_PLUGIN_VERSIONCODE) $@
+
+$(PATH_STAGE_PREFIX).%/res/values/strings.xml: $(PATH_DIST)/mkplugin.sh $(srcdir)/configure $(PATH_DIST)/plugin-manifest.xml
+	@$(MKDIR) -p $(@D)
+	$(PATH_DIST)/mkplugin.sh $(srcdir)/configure $* $(PATH_DIST)/plugin-strings.xml $(ANDROID_PLUGIN_VERSIONCODE) $@
 
 $(PATH_STAGE_PREFIX).%/res/drawable/scummvm.png: $(PATH_RESOURCES)/drawable/scummvm.png
 	@$(MKDIR) -p $(@D)
-- 
cgit v1.2.3


From b0351e1b85a550ec4f2422d4439e5ce17150f5a3 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sat, 9 Apr 2011 18:37:06 +0200
Subject: ANDROID: Automate the Manifest's versionCode

---
 backends/platform/android/android.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'backends/platform/android')

diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index fdb0f8096a..7cf6587cc0 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -1,7 +1,7 @@
 # Android specific build targets
 
 # These must be incremented for each market upload
-#ANDROID_VERSIONCODE = 6  Specified in dists/android/AndroidManifest.xml.in
+ANDROID_VERSIONCODE = 6
 ANDROID_PLUGIN_VERSIONCODE = 6
 
 JAVA_FILES = \
@@ -72,7 +72,8 @@ PATH_GEN = $(PATH_GEN_TOP)/$(PATH_REL)
 PATH_CLASSES_MAIN = $(PATH_BUILD_CLASSES_MAIN_TOP)/$(PATH_REL)
 PATH_CLASSES_PLUGIN = $(PATH_BUILD_CLASSES_PLUGIN_TOP)/$(PATH_REL)
 
-FILE_MANIFEST = $(srcdir)/dists/android/AndroidManifest.xml
+FILE_MANIFEST_SRC = $(srcdir)/dists/android/AndroidManifest.xml
+FILE_MANIFEST = $(PATH_BUILD)/AndroidManifest.xml
 FILE_DEX = $(PATH_BUILD)/classes.dex
 FILE_DEX_PLUGIN = $(PATH_BUILD)/plugins/classes.dex
 FILE_RESOURCES = resources.ap_
@@ -87,6 +88,9 @@ CLASSES_PLUGIN = $(addprefix $(PATH_CLASSES_PLUGIN)/, $(JAVA_FILES_PLUGIN:%.java
 APK_MAIN = scummvm.apk
 APK_PLUGINS = $(patsubst plugins/lib%.so, scummvm-engine-%.apk, $(PLUGINS))
 
+$(FILE_MANIFEST): $(FILE_MANIFEST_SRC)
+	sed "s/@ANDROID_VERSIONCODE@/$(ANDROID_VERSIONCODE)/" < $< > $@
+
 $(SRC_GEN): $(FILE_MANIFEST) $(filter %.xml,$(RESOURCES)) $(ANDROID_JAR8)
 	@$(MKDIR) -p $(PATH_GEN_TOP)
 	$(AAPT) package -m -J $(PATH_GEN_TOP) -M $< -S $(PATH_RESOURCES) -I $(ANDROID_JAR8)
-- 
cgit v1.2.3


From 6c0bca8aae3c84d55f1a8abbbe4ee3c52e2a2427 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sun, 10 Apr 2011 11:12:40 +0200
Subject: ANDROID: Add missing mkdir

---
 backends/platform/android/android.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform/android')

diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 7cf6587cc0..77fdb139d8 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -89,6 +89,7 @@ APK_MAIN = scummvm.apk
 APK_PLUGINS = $(patsubst plugins/lib%.so, scummvm-engine-%.apk, $(PLUGINS))
 
 $(FILE_MANIFEST): $(FILE_MANIFEST_SRC)
+	@$(MKDIR) -p $(@D)
 	sed "s/@ANDROID_VERSIONCODE@/$(ANDROID_VERSIONCODE)/" < $< > $@
 
 $(SRC_GEN): $(FILE_MANIFEST) $(filter %.xml,$(RESOURCES)) $(ANDROID_JAR8)
-- 
cgit v1.2.3