Merge branch 'master' into gitlab-upstream-master

Author: zhengshuxin

android/acl_c++_shared/build.gradle

@@ -1,11 +1,6 @@
 apply plugin: 'com.android.library'
 
-/*
 buildscript {
-    plugins {
-        id 'com.android.library'
-    }
-
     repositories {
         google()
         jcenter()
@@ -17,7 +12,6 @@ buildscript {
     }
     //implementation {}
 }
-*/
 
 android {
     compileSdkVersion 28

android/acl_ndk20/acl_one/build.gradle

@@ -1,13 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 36
-    //buildToolsVersion "28.0.3"
-
+    compileSdkVersion 29  // 使用旧语法，兼容 AGP 4.2.2
+    //buildToolsVersion "29.0.2"
+    //ndkVersion "20.1.5948944"
+    
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 36
-
+        targetSdkVersion 29
+        
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_STL=c++_shared"
@@ -22,7 +23,7 @@ android {
                 arguments "-Wl,-z,common-page-size=16384"
 
                 abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86'
-                targets 'acl_static', 'protocol_static', 'acl_cpp_static', 'fiber_static', 'fiber_cpp_static', 'acl_shared', 'protocol_shared', 'acl_cpp_shared', 'fiber_shared', 'fiber_cpp_shared'  // for ndk20 or above
+                targets 'acl_static', 'protocol_static', 'acl_cpp_static', 'fiber_static', 'fiber_cpp_static', 'acl_shared', 'protocol_shared', 'acl_cpp_shared', 'fiber_shared', 'fiber_cpp_shared'
             }
         }
     }
@@ -43,9 +44,11 @@ android {
     externalNativeBuild {
         cmake {
             path '../../../CMakeLists.txt'
-            //version "3.6.0"
         }
     }
+    
+    // 指定 NDK 版本
+    //ndkVersion "20.1.5948944"
 }
 
 dependencies {

android/acl_ndk20/build.gradle

@@ -4,7 +4,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
+        //classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 

android/acl_ndk20/build.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+time gradle build

android/acl_ndk20/clean.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+#cd acl_one
+#gradle clean
+#cd -
+#cd http
+#gradle clean
+#cd -
+
+gradle clean
+
+rm -rf build
+rm -rf .gradle
+rm -rf acl_one/build
+rm -rf acl_one/.cxx
+rm -rf http/build
+rm -rf http/.cxx

android/acl_ndk20/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-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

android/acl_ndk20/gradlew

@@ -2,13 +2,15 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    //buildToolsVersion "29.0.2"
+    //compileSdk 29
+    buildToolsVersion "29.0.2"
+
     defaultConfig {
         applicationId "com.example.http"
-        minSdkVersion 15
+        minSdkVersion 14
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        //versionCode 14
+        //versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {