[Scummvm-cvs-logs] scummvm master -> cac7be425a92781341e3dc4b6882d42b4f17f9f3

[fuzzie]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cac7be425a ANDROID: Remove plugins/unpacker from makefile.


Commit: cac7be425a92781341e3dc4b6882d42b4f17f9f3
    https://github.com/scummvm/scummvm/commit/cac7be425a92781341e3dc4b6882d42b4f17f9f3
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2015-01-18T12:04:15+01:00

Commit Message:
ANDROID: Remove plugins/unpacker from makefile.

Changed paths:
    backends/platform/android/android.mk



diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 5be9f86..e11ad07 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -35,7 +35,6 @@ FILE_MANIFEST = $(PATH_BUILD)/AndroidManifest.xml
 
 APK_MAIN = ScummVM-debug.apk
 APK_MAIN_RELEASE = ScummVM-release-unsigned.apk
-APK_PLUGINS = $(patsubst plugins/lib%.so, scummvm-engine-%.apk, $(PLUGINS))
 
 $(FILE_MANIFEST): $(FILE_MANIFEST_SRC) | $(PATH_BUILD)
 	@$(MKDIR) -p $(@D)
@@ -89,18 +88,18 @@ androidrelease: $(APK_MAIN_RELEASE)
 
 androidtestmain: $(APK_MAIN)
 	$(ADB) install -r $(APK_MAIN)
-	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.Unpacker
+	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.ScummVMActivity
 
-androidtest: $(APK_MAIN) $(APK_PLUGINS)
+androidtest: $(APK_MAIN)
 	@set -e; for apk in $^; do \
 		$(ADB) install -r $$apk; \
 	done
-	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.Unpacker
+	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.ScummVMActivity
 
 # used by buildbot!
 androiddistdebug: all
 	$(MKDIR) debug
-	$(CP) $(APK_MAIN) $(APK_PLUGINS) debug/
+	$(CP) $(APK_MAIN) debug/
 	for i in $(DIST_FILES_DOCS) $(PORT_DISTFILES); do \
 		sed 's/$$/\r/' < $$i > debug/`basename $$i`.txt; \
 	done