Skip to content
Permalink
Browse files

ANDROID: Set target SDK to 26 to AndroidManifest.xml and project.prop…

…erties files
  • Loading branch information...
antoniou79 committed Oct 5, 2019
1 parent 0dc1f57 commit caaa4399cd6cdea3342299ffd301c20d679a75c3
@@ -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)
@@ -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"/>
@@ -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"/>
@@ -8,4 +8,4 @@
# project structure.

# Project target.
target=android-14
target=android-26

0 comments on commit caaa439

Please sign in to comment.
You can’t perform that action at this time.