diff options
| author | Alyssa Milburn | 2015-01-18 12:04:15 +0100 |
|---|---|---|
| committer | Alyssa Milburn | 2015-01-18 12:04:15 +0100 |
| commit | cac7be425a92781341e3dc4b6882d42b4f17f9f3 (patch) | |
| tree | e4cea3d1c8022aa79675c697e3196d737ac2da95 /backends/platform | |
| parent | 124459784987ece0088e829d3ce354997e9d6bb6 (diff) | |
| download | scummvm-rg350-cac7be425a92781341e3dc4b6882d42b4f17f9f3.tar.gz scummvm-rg350-cac7be425a92781341e3dc4b6882d42b4f17f9f3.tar.bz2 scummvm-rg350-cac7be425a92781341e3dc4b6882d42b4f17f9f3.zip | |
ANDROID: Remove plugins/unpacker from makefile.
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/android/android.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk index 5be9f86770..e11ad0724e 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 |