diff options
| author | David Turner | 2014-06-19 08:36:04 +0100 |
|---|---|---|
| committer | David Turner | 2014-06-19 08:36:04 +0100 |
| commit | 6ea564d9b8f716b6861a6021b972fc224c89fb72 (patch) | |
| tree | e9495d1bb0ea703bd53b169315dafff8e0c550f4 /backends/platform/android | |
| parent | 0a07cf1481cf00d872f65040963ee70e084aac5a (diff) | |
| parent | 0e459796346ca98684a115302f448a6317799372 (diff) | |
| download | scummvm-rg350-6ea564d9b8f716b6861a6021b972fc224c89fb72.tar.gz scummvm-rg350-6ea564d9b8f716b6861a6021b972fc224c89fb72.tar.bz2 scummvm-rg350-6ea564d9b8f716b6861a6021b972fc224c89fb72.zip | |
Merge pull request #468 from zeldin/new_android_sdk
ANDROID: Allow build with newer SDK
Diffstat (limited to 'backends/platform/android')
| -rw-r--r-- | backends/platform/android/android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk index 7c4fe01d54..1a40299dcd 100644 --- a/backends/platform/android/android.mk +++ b/backends/platform/android/android.mk @@ -48,10 +48,10 @@ PLUGIN_RESOURCES = \ #LDFLAGS += -Wl,--gc-sections #CXXFLAGS += -ffunction-sections -fdata-sections -fvisibility=hidden -fvisibility-inlines-hidden -AAPT = $(ANDROID_SDK)/platform-tools/aapt +AAPT = $(ANDROID_SDK)/$(ANDROID_BTOOLS)/aapt ADB = $(ANDROID_SDK)/platform-tools/adb -DX = $(ANDROID_SDK)/platform-tools/dx -APKBUILDER = $(ANDROID_SDK)/tools/apkbuilder +DX = $(ANDROID_SDK)/$(ANDROID_BTOOLS)/dx +APKBUILDER = java -Xmx128M -classpath $(ANDROID_SDK)/tools/lib/sdklib.jar com.android.sdklib.build.ApkBuilderMain JAVAC ?= javac JAVACFLAGS = -source 1.5 -target 1.5 |