Merge remote-tracking branch 'origin/master'

2017-10-17 10:25:22 +08:00 · 2017-10-17 10:25:22 +08:00 · fb6a0d7631
commit fb6a0d7631
parent 88e15147b8 1454e53b79
1 changed files with 4 additions and 0 deletions
--- a/android/make.sh
+++ b/android/make.sh
@ -342,6 +342,10 @@ check_error
 # Build apk
 echo "Building APK"

+sed -i "s/minSdkVersion=\".*\"/minSdkVersion=\"$SDK_VERSION\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+
+
 if [ "$BUILD_TOOL" = "gradle" ]; then
    export ANDROID_HOME="$SDK_PATH"
    gradle -Psdk_version=$SDK_VERSION           \