[Android] Update gradle version to 4.1.0 (#127)

PaddlePaddle · Apr 26, 2021 · 398c589 · 398c589
1 parent 9595b07
commit 398c589
Show file tree

Hide file tree

Showing 25 changed files with 22 additions and 267 deletions.
diff --git a/PaddleLite-android-demo/camera_preview_demo/build.gradle b/PaddleLite-android-demo/camera_preview_demo/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/PaddleLite-android-demo/camera_preview_demo/gradle/wrapper/gradle-wrapper.properties b/PaddleLite-android-demo/camera_preview_demo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
diff --git a/PaddleLite-android-demo/face_detection_demo/build.gradle b/PaddleLite-android-demo/face_detection_demo/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/PaddleLite-android-demo/face_detection_demo/gradle/wrapper/gradle-wrapper.properties b/PaddleLite-android-demo/face_detection_demo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
diff --git a/PaddleLite-android-demo/face_keypoints_detection_demo/app/src/main/cpp/CMakeLists.txt b/PaddleLite-android-demo/face_keypoints_detection_demo/app/src/main/cpp/CMakeLists.txt
@@ -144,52 +144,3 @@ target_link_libraries(
   hiai_ir
   hiai_ir_build
   hcl)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libc++_shared.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libc++_shared.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libpaddle_light_api_shared.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpaddle_light_api_shared.so)
-
-# Comment the followings if libpaddle_light_api_shared.so is not fit for NPU
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai_ir.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai_ir.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai_ir_build.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai_ir_build.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhcl.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhcl.so)
diff --git a/PaddleLite-android-demo/face_keypoints_detection_demo/build.gradle b/PaddleLite-android-demo/face_keypoints_detection_demo/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/...eLite-android-demo/face_keypoints_detection_demo/gradle/wrapper/gradle-wrapper.properties b/...eLite-android-demo/face_keypoints_detection_demo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
diff --git a/PaddleLite-android-demo/human_segmentation_demo/build.gradle b/PaddleLite-android-demo/human_segmentation_demo/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/PaddleLite-android-demo/human_segmentation_demo/gradle/wrapper/gradle-wrapper.properties b/PaddleLite-android-demo/human_segmentation_demo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
diff --git a/PaddleLite-android-demo/image_classification_demo/build.gradle b/PaddleLite-android-demo/image_classification_demo/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/PaddleLite-android-demo/image_classification_demo/gradle/wrapper/gradle-wrapper.properties b/PaddleLite-android-demo/image_classification_demo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
diff --git a/PaddleLite-android-demo/mask_detection_demo/app/src/main/cpp/CMakeLists.txt b/PaddleLite-android-demo/mask_detection_demo/app/src/main/cpp/CMakeLists.txt
@@ -144,52 +144,3 @@ target_link_libraries(
   hiai_ir
   hiai_ir_build
   hcl)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libc++_shared.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libc++_shared.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libpaddle_light_api_shared.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpaddle_light_api_shared.so)
-
-# Comment the followings if libpaddle_light_api_shared.so is not fit for NPU
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai_ir.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai_ir.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai_ir_build.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai_ir_build.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhcl.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhcl.so)
diff --git a/PaddleLite-android-demo/mask_detection_demo/build.gradle b/PaddleLite-android-demo/mask_detection_demo/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/PaddleLite-android-demo/mask_detection_demo/gradle/wrapper/gradle-wrapper.properties b/PaddleLite-android-demo/mask_detection_demo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
diff --git a/PaddleLite-android-demo/mobilenet_classification_demo/app/src/main/cpp/CMakeLists.txt b/PaddleLite-android-demo/mobilenet_classification_demo/app/src/main/cpp/CMakeLists.txt
@@ -144,52 +144,3 @@ target_link_libraries(
   hiai_ir
   hiai_ir_build
   hcl)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libc++_shared.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libc++_shared.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libpaddle_light_api_shared.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpaddle_light_api_shared.so)
-
-# Comment the followings if libpaddle_light_api_shared.so is not fit for NPU
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai_ir.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai_ir.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai_ir_build.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai_ir_build.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhcl.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhcl.so)
diff --git a/PaddleLite-android-demo/mobilenet_classification_demo/build.gradle b/PaddleLite-android-demo/mobilenet_classification_demo/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/...eLite-android-demo/mobilenet_classification_demo/gradle/wrapper/gradle-wrapper.properties b/...eLite-android-demo/mobilenet_classification_demo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
diff --git a/PaddleLite-android-demo/object_detection_demo/build.gradle b/PaddleLite-android-demo/object_detection_demo/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/PaddleLite-android-demo/object_detection_demo/gradle/wrapper/gradle-wrapper.properties b/PaddleLite-android-demo/object_detection_demo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
diff --git a/PaddleLite-android-demo/ssd_detection_demo/app/src/main/cpp/CMakeLists.txt b/PaddleLite-android-demo/ssd_detection_demo/app/src/main/cpp/CMakeLists.txt
@@ -145,53 +145,4 @@ target_link_libraries(
   hiai_ir
   hiai_ir_build
   hcl
-  )
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libc++_shared.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libc++_shared.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libpaddle_light_api_shared.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpaddle_light_api_shared.so)
-
-# Comment the followings if libpaddle_light_api_shared.so is not fit for NPU
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai_ir.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai_ir.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhiai_ir_build.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhiai_ir_build.so)
-
-add_custom_command(
-  TARGET Native
-  POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    ${PaddleLite_DIR}/cxx/libs/${ANDROID_ABI}/libhcl.so
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhcl.so)
+  )
diff --git a/PaddleLite-android-demo/ssd_detection_demo/build.gradle b/PaddleLite-android-demo/ssd_detection_demo/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/PaddleLite-android-demo/ssd_detection_demo/gradle/wrapper/gradle-wrapper.properties b/PaddleLite-android-demo/ssd_detection_demo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip