diff options
| author | Joel Teichroeb | 2015-01-05 20:14:17 -0800 |
|---|---|---|
| committer | Joel Teichroeb | 2015-01-05 20:18:31 -0800 |
| commit | 59934881a1dc27e0c6030d2133ec3f9aae583df7 (patch) | |
| tree | fa987d7bf7080f9b2d1013b9bdc5cb3d0f63c0e2 /backends/platform/android/android.mk | |
| parent | 02e3e82e8210abe9f496f978917c9b134b5e0ad9 (diff) | |
| download | scummvm-rg350-59934881a1dc27e0c6030d2133ec3f9aae583df7.tar.gz scummvm-rg350-59934881a1dc27e0c6030d2133ec3f9aae583df7.tar.bz2 scummvm-rg350-59934881a1dc27e0c6030d2133ec3f9aae583df7.zip | |
ANDROID: Remove unpacker and fix support for non arm
Diffstat (limited to 'backends/platform/android/android.mk')
| -rw-r--r-- | backends/platform/android/android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk index f9a2bc9813..5be9f86770 100644 --- a/backends/platform/android/android.mk +++ b/backends/platform/android/android.mk @@ -5,7 +5,7 @@ ANDROID_VERSIONCODE = 6 ANDROID_TARGET_VERSION = 14 -NDK_BUILD = $(ANDROID_NDK)/ndk-build +NDK_BUILD = $(ANDROID_NDK)/ndk-build APP_ABI=$(ABI) SDK_ANDROID = $(ANDROID_SDK)/tools/android PATH_DIST = $(srcdir)/dists/android @@ -18,8 +18,6 @@ RESOURCES = \ $(PATH_BUILD_RES)/values/strings.xml \ $(PATH_BUILD_RES)/values-television/margins.xml \ $(PATH_BUILD_RES)/layout/main.xml \ - $(PATH_BUILD_RES)/layout/splash.xml \ - $(PATH_BUILD_RES)/drawable/gradient.xml \ $(PATH_BUILD_RES)/drawable/scummvm.png \ $(PATH_BUILD_RES)/drawable/scummvm_big.png \ $(PATH_BUILD_RES)/drawable-xhdpi/ouya_icon.png @@ -30,7 +28,7 @@ DIST_BUILD_XML = $(PATH_DIST)/custom_rules.xml PATH_BUILD = ./build.tmp PATH_BUILD_ASSETS = $(PATH_BUILD)/assets PATH_BUILD_RES = $(PATH_BUILD)/res -PATH_BUILD_LIBSCUMMVM = $(PATH_BUILD)/mylib/armeabi/libscummvm.so +PATH_BUILD_LIBSCUMMVM = $(PATH_BUILD)/lib/$(ABI)/libscummvm.so FILE_MANIFEST_SRC = $(srcdir)/dists/android/AndroidManifest.xml FILE_MANIFEST = $(PATH_BUILD)/AndroidManifest.xml |