From 2bab501cac6f48216fa9499e345e9620a83a2cdb Mon Sep 17 00:00:00 2001
From: CHP <crazyhappygame@gmail.com>
Date: Sun, 22 Jul 2018 07:58:58 +0200
Subject: [PATCH]  Update android build tools to 27.0.3 (#18952)

* Update gradle and android gradle plugin

* Update android build tools to 27.0.3
---
 cocos/platform/android/libcocos2dx-with-controller/build.gradle | 1 -
 cocos/platform/android/libcocos2dx/build.gradle                 | 1 -
 templates/cpp-template-default/proj.android/app/build.gradle    | 1 -
 templates/cpp-template-default/proj.android/gradle.properties   | 2 --
 .../frameworks/runtime-src/proj.android/app/build.gradle        | 1 -
 .../frameworks/runtime-src/proj.android/gradle.properties       | 2 --
 .../frameworks/runtime-src/proj.android/app/build.gradle        | 1 -
 .../frameworks/runtime-src/proj.android/gradle.properties       | 2 --
 tests/cpp-empty-test/proj.android/app/build.gradle              | 1 -
 tests/cpp-empty-test/proj.android/gradle.properties             | 2 --
 tests/cpp-tests/proj.android/app/build.gradle                   | 1 -
 tests/cpp-tests/proj.android/gradle.properties                  | 2 --
 tests/game-controller-test/proj.android/app/build.gradle        | 1 -
 tests/game-controller-test/proj.android/gradle.properties       | 2 --
 tests/js-tests/project/proj.android/app/build.gradle            | 1 -
 tests/js-tests/project/proj.android/gradle.properties           | 2 --
 tests/lua-empty-test/project/proj.android/app/build.gradle      | 1 -
 tests/lua-empty-test/project/proj.android/gradle.properties     | 2 --
 .../project/proj.android/app/build.gradle                       | 1 -
 .../project/proj.android/gradle.properties                      | 2 --
 tests/lua-tests/project/proj.android/app/build.gradle           | 1 -
 tests/lua-tests/project/proj.android/gradle.properties          | 2 --
 tests/performance-tests/proj.android/app/build.gradle           | 1 -
 tests/performance-tests/proj.android/gradle.properties          | 2 --
 tools/appveyor-scripts/setup_android.py                         | 2 +-
 25 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/cocos/platform/android/libcocos2dx-with-controller/build.gradle b/cocos/platform/android/libcocos2dx-with-controller/build.gradle
index 44ef98a70a..94f3dd451d 100644
--- a/cocos/platform/android/libcocos2dx-with-controller/build.gradle
+++ b/cocos/platform/android/libcocos2dx-with-controller/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         minSdkVersion PROP_MIN_SDK_VERSION
diff --git a/cocos/platform/android/libcocos2dx/build.gradle b/cocos/platform/android/libcocos2dx/build.gradle
index bea87e6028..44f9a32055 100644
--- a/cocos/platform/android/libcocos2dx/build.gradle
+++ b/cocos/platform/android/libcocos2dx/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         minSdkVersion PROP_MIN_SDK_VERSION
diff --git a/templates/cpp-template-default/proj.android/app/build.gradle b/templates/cpp-template-default/proj.android/app/build.gradle
index 7c152d4af4..51c4b9a774 100644
--- a/templates/cpp-template-default/proj.android/app/build.gradle
+++ b/templates/cpp-template-default/proj.android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId "org.cocos2dx.hellocpp"
diff --git a/templates/cpp-template-default/proj.android/gradle.properties b/templates/cpp-template-default/proj.android/gradle.properties
index f234b82087..1a592bfa38 100644
--- a/templates/cpp-template-default/proj.android/gradle.properties
+++ b/templates/cpp-template-default/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle b/templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle
index 86723cd750..50d078eeeb 100644
--- a/templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle
+++ b/templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId "org.cocos2dx.hellojavascript"
diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android/gradle.properties b/templates/js-template-default/frameworks/runtime-src/proj.android/gradle.properties
index f234b82087..1a592bfa38 100644
--- a/templates/js-template-default/frameworks/runtime-src/proj.android/gradle.properties
+++ b/templates/js-template-default/frameworks/runtime-src/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle
index a5ddc391d4..8e9abd2ddb 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId "org.cocos2dx.hellolua"
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/gradle.properties b/templates/lua-template-default/frameworks/runtime-src/proj.android/gradle.properties
index f234b82087..1a592bfa38 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.android/gradle.properties
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
diff --git a/tests/cpp-empty-test/proj.android/app/build.gradle b/tests/cpp-empty-test/proj.android/app/build.gradle
index 8b8b38e6b3..8b8d7db847 100644
--- a/tests/cpp-empty-test/proj.android/app/build.gradle
+++ b/tests/cpp-empty-test/proj.android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId "org.cocos2dx.cpp_empty_test"
diff --git a/tests/cpp-empty-test/proj.android/gradle.properties b/tests/cpp-empty-test/proj.android/gradle.properties
index f234b82087..1a592bfa38 100644
--- a/tests/cpp-empty-test/proj.android/gradle.properties
+++ b/tests/cpp-empty-test/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
diff --git a/tests/cpp-tests/proj.android/app/build.gradle b/tests/cpp-tests/proj.android/app/build.gradle
index 12b642a577..5a38a9dcf7 100644
--- a/tests/cpp-tests/proj.android/app/build.gradle
+++ b/tests/cpp-tests/proj.android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId "org.cocos2dx.cpp_tests"
diff --git a/tests/cpp-tests/proj.android/gradle.properties b/tests/cpp-tests/proj.android/gradle.properties
index f234b82087..1a592bfa38 100644
--- a/tests/cpp-tests/proj.android/gradle.properties
+++ b/tests/cpp-tests/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
diff --git a/tests/game-controller-test/proj.android/app/build.gradle b/tests/game-controller-test/proj.android/app/build.gradle
index 0d02886dbb..14f6d60717 100644
--- a/tests/game-controller-test/proj.android/app/build.gradle
+++ b/tests/game-controller-test/proj.android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
     
     defaultConfig {
         applicationId "org.cocos2dx.game_controller_test"
diff --git a/tests/game-controller-test/proj.android/gradle.properties b/tests/game-controller-test/proj.android/gradle.properties
index 81ff4ef4eb..eaef15647b 100644
--- a/tests/game-controller-test/proj.android/gradle.properties
+++ b/tests/game-controller-test/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi | armeabi-v7a | arm64-v8a | x86)
diff --git a/tests/js-tests/project/proj.android/app/build.gradle b/tests/js-tests/project/proj.android/app/build.gradle
index c3238345a0..cca959f55e 100644
--- a/tests/js-tests/project/proj.android/app/build.gradle
+++ b/tests/js-tests/project/proj.android/app/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId "org.cocos2dx.js_tests"
diff --git a/tests/js-tests/project/proj.android/gradle.properties b/tests/js-tests/project/proj.android/gradle.properties
index f234b82087..1a592bfa38 100644
--- a/tests/js-tests/project/proj.android/gradle.properties
+++ b/tests/js-tests/project/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
diff --git a/tests/lua-empty-test/project/proj.android/app/build.gradle b/tests/lua-empty-test/project/proj.android/app/build.gradle
index c16057ccf9..3589a890d1 100644
--- a/tests/lua-empty-test/project/proj.android/app/build.gradle
+++ b/tests/lua-empty-test/project/proj.android/app/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId "org.cocos2dx.lua_empty_test"
diff --git a/tests/lua-empty-test/project/proj.android/gradle.properties b/tests/lua-empty-test/project/proj.android/gradle.properties
index f234b82087..1a592bfa38 100644
--- a/tests/lua-empty-test/project/proj.android/gradle.properties
+++ b/tests/lua-empty-test/project/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
diff --git a/tests/lua-game-controller-test/project/proj.android/app/build.gradle b/tests/lua-game-controller-test/project/proj.android/app/build.gradle
index d52b62a97b..ec08d107c7 100644
--- a/tests/lua-game-controller-test/project/proj.android/app/build.gradle
+++ b/tests/lua-game-controller-test/project/proj.android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId "org.cocos2dx.LuaGameControllerTest"
diff --git a/tests/lua-game-controller-test/project/proj.android/gradle.properties b/tests/lua-game-controller-test/project/proj.android/gradle.properties
index 81ff4ef4eb..eaef15647b 100644
--- a/tests/lua-game-controller-test/project/proj.android/gradle.properties
+++ b/tests/lua-game-controller-test/project/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi | armeabi-v7a | arm64-v8a | x86)
diff --git a/tests/lua-tests/project/proj.android/app/build.gradle b/tests/lua-tests/project/proj.android/app/build.gradle
index 1fd10de990..a0ef2bd8fa 100644
--- a/tests/lua-tests/project/proj.android/app/build.gradle
+++ b/tests/lua-tests/project/proj.android/app/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId "org.cocos2dx.lua_tests"
diff --git a/tests/lua-tests/project/proj.android/gradle.properties b/tests/lua-tests/project/proj.android/gradle.properties
index f234b82087..1a592bfa38 100644
--- a/tests/lua-tests/project/proj.android/gradle.properties
+++ b/tests/lua-tests/project/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
diff --git a/tests/performance-tests/proj.android/app/build.gradle b/tests/performance-tests/proj.android/app/build.gradle
index 7c9467f693..28481c7edc 100644
--- a/tests/performance-tests/proj.android/app/build.gradle
+++ b/tests/performance-tests/proj.android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
-    buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId "org.cocos2dx.performance_tests"
diff --git a/tests/performance-tests/proj.android/gradle.properties b/tests/performance-tests/proj.android/gradle.properties
index 81ff4ef4eb..eaef15647b 100644
--- a/tests/performance-tests/proj.android/gradle.properties
+++ b/tests/performance-tests/proj.android/gradle.properties
@@ -26,8 +26,6 @@ PROP_MIN_SDK_VERSION=14
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=27
 
-# Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=27.0.1
 
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi | armeabi-v7a | arm64-v8a | x86)
diff --git a/tools/appveyor-scripts/setup_android.py b/tools/appveyor-scripts/setup_android.py
index 84ca5529f2..b4b5d6dded 100644
--- a/tools/appveyor-scripts/setup_android.py
+++ b/tools/appveyor-scripts/setup_android.py
@@ -83,7 +83,7 @@ def install_android_sdk():
     cmd1 = SDK_MANAGER + switches
     packages = [
         "platforms;android-27",
-        "build-tools;27.0.1",
+        "build-tools;27.0.3",
         "platform-tools",
         "tools"
     ]