From bbdd289a621da8080495f3bad8a610a319d7a062 Mon Sep 17 00:00:00 2001
From: Peter Siegmund <developer@mars3142.org>
Date: Wed, 27 Dec 2017 02:36:11 +0100
Subject: [PATCH] Fix gradlew build (#18592)

* fixed ProGuard rule file

* add missing VIBRATE permission

* move permission to correct position in AndroidManifest.xml
---
 .../android/libcocos2dx-with-controller/AndroidManifest.xml   | 2 ++
 cocos/platform/android/libcocos2dx/AndroidManifest.xml        | 2 ++
 .../cpp-template-default/proj.android/app/AndroidManifest.xml | 4 ++--
 .../cpp-template-default/proj.android/app/proguard-rules.pro  | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cocos/platform/android/libcocos2dx-with-controller/AndroidManifest.xml b/cocos/platform/android/libcocos2dx-with-controller/AndroidManifest.xml
index bd550c5547..cc170d62a6 100644
--- a/cocos/platform/android/libcocos2dx-with-controller/AndroidManifest.xml
+++ b/cocos/platform/android/libcocos2dx-with-controller/AndroidManifest.xml
@@ -1,5 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.cocos2dx.lib">
 
+    <uses-permission android:name="android.permission.VIBRATE" />
+
     <application android:allowBackup="true">
 
     </application>
diff --git a/cocos/platform/android/libcocos2dx/AndroidManifest.xml b/cocos/platform/android/libcocos2dx/AndroidManifest.xml
index bd550c5547..cc170d62a6 100644
--- a/cocos/platform/android/libcocos2dx/AndroidManifest.xml
+++ b/cocos/platform/android/libcocos2dx/AndroidManifest.xml
@@ -1,5 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.cocos2dx.lib">
 
+    <uses-permission android:name="android.permission.VIBRATE" />
+
     <application android:allowBackup="true">
 
     </application>
diff --git a/templates/cpp-template-default/proj.android/app/AndroidManifest.xml b/templates/cpp-template-default/proj.android/app/AndroidManifest.xml
index f8a8d00f4f..489eff1254 100644
--- a/templates/cpp-template-default/proj.android/app/AndroidManifest.xml
+++ b/templates/cpp-template-default/proj.android/app/AndroidManifest.xml
@@ -3,6 +3,8 @@
     package="org.cocos2dx.hellocpp"
     android:installLocation="auto">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+    
     <uses-feature android:glEsVersion="0x00020000" />
     
     <application
@@ -28,6 +30,4 @@
         </activity>
     </application>
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    
 </manifest>
diff --git a/templates/cpp-template-default/proj.android/app/proguard-rules.pro b/templates/cpp-template-default/proj.android/app/proguard-rules.pro
index ecbfe714e5..2c062c4946 100644
--- a/templates/cpp-template-default/proj.android/app/proguard-rules.pro
+++ b/templates/cpp-template-default/proj.android/app/proguard-rules.pro
@@ -21,7 +21,7 @@
 -dontwarn org.cocos2dx.**
 -keep public class com.chukong.** { *; }
 -dontwarn com.chukong.**
--keep public com.huawei.android.** { *; }
+-keep public class com.huawei.android.** { *; }
 -dontwarn com.huawei.android.**
 
 # Proguard Apache HTTP for release