diff options
| author | Thanasis Antoniou | 2019-10-05 23:56:17 +0300 |
|---|---|---|
| committer | Thanasis Antoniou | 2019-10-05 23:57:35 +0300 |
| commit | 30b789de39cb7c734597ac6eba1bdccd276b31f6 (patch) | |
| tree | 12eb9cab8b73f63574610851110b6ed4798db8c4 | |
| parent | 4e629e4f916d4fd92a81f0be329ef85ebac8d5e0 (diff) | |
| download | scummvm-rg350-30b789de39cb7c734597ac6eba1bdccd276b31f6.tar.gz scummvm-rg350-30b789de39cb7c734597ac6eba1bdccd276b31f6.tar.bz2 scummvm-rg350-30b789de39cb7c734597ac6eba1bdccd276b31f6.zip | |
ANDROID: Set target SDK to 26 to AndroidManifest.xml and project.properties files
| -rw-r--r-- | backends/platform/android/android.mk | 12 | ||||
| -rw-r--r-- | dists/android/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | dists/android/AndroidManifest.xml.in | 2 | ||||
| -rw-r--r-- | dists/android/project.properties | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk index c72058cab3..698fd7588c 100644 --- a/backends/platform/android/android.mk +++ b/backends/platform/android/android.mk @@ -11,6 +11,9 @@ ANDROID_VERSIONCODE = 35 ANDROID_TARGET_VERSION = 26 +# ndk-build will build the scummvm library in release mode by default unless: +# - an Application.mk is provided in the jni folder with APP_OPTIM := debug +# - or AndroidManifest.xml declares android:debuggable within its <application> tag NDK_BUILD = $(ANDROID_NDK)/ndk-build APP_ABI=$(ABI) SDK_ANDROID = $(ANDROID_SDK)/tools/android @@ -93,7 +96,7 @@ all: $(APK_MAIN) clean: androidclean androidclean: - @$(RM) -rf $(PATH_BUILD) *.apk release + @$(RM) -rf $(PATH_BUILD) *.apk release debug androidrelease: $(APK_MAIN_RELEASE) @@ -115,4 +118,11 @@ androiddistdebug: all sed 's/$$/\r/' < $$i > debug/`basename $$i`.txt; \ done +androiddistrelease: androidrelease + $(MKDIR) release + $(CP) $(APK_MAIN_RELEASE) release/ + for i in $(DIST_FILES_DOCS) $(PORT_DISTFILES); do \ + sed 's/$$/\r/' < $$i > release/`basename $$i`.txt; \ + done + .PHONY: androidrelease androidtest $(PATH_BUILD_SRC) diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index 0d32c4b727..c74458ba7c 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -8,7 +8,7 @@ android:sharedUserId="org.scummvm.scummvm"> <uses-sdk android:minSdkVersion="3" - android:targetSdkVersion="14"/> + android:targetSdkVersion="26"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index 11a576e0ad..fa1eafa4e8 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -8,7 +8,7 @@ android:sharedUserId="org.scummvm.scummvm"> <uses-sdk android:minSdkVersion="3" - android:targetSdkVersion="14"/> + android:targetSdkVersion="26"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> diff --git a/dists/android/project.properties b/dists/android/project.properties index 730e911f2f..3c0d189e0d 100644 --- a/dists/android/project.properties +++ b/dists/android/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-14 +target=android-26 |