From 5ffc45821d3cf36298ef9ff62bc2ff38136d669f Mon Sep 17 00:00:00 2001
From: superzheng <superzheng@tencent.com>
Date: Tue, 29 Jun 2021 17:30:55 +0800
Subject: [PATCH] chore(android): build jni libraries with c++_shared stl

---
 android/sdk/build.gradle | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 54918b45c..97110a35d 100644
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -6,7 +6,6 @@ ext {
   CMAKE_PATH = "$projectDir.absolutePath/src/main/jni/CMakeLists.txt"
   OUTPUT_PATH = "$buildDir/outputs/aar"
   THIRD_PARTY_LIBRARY_PATH = "$projectDir.absolutePath/src/main/jni/third_party"
-  JNI_LIBRARY_PATH = "$projectDir.absolutePath/libs"
   skipCmakeAndNinja = System.getenv('skipCmakeAndNinja') != null
 }
 
@@ -49,6 +48,7 @@ allprojects {
 android {
   archivesBaseName = ARCHIVES_BASE_NAME
   compileSdkVersion COMPILE_SDK_VERSION as int
+  ndkVersion = NDK_VERSION
   defaultConfig {
     minSdkVersion MIN_SDK_VERSION as int
     targetSdkVersion TARGET_SDK_VERSION as int
@@ -62,6 +62,7 @@ android {
     buildConfigField("boolean", "INCLUDE_SUPPORT_UI", INCLUDE_SUPPORT_UI)
 
     packagingOptions {
+      pickFirst 'lib/*/libc++_shared.so'
       if (!INCLUDE_ABI_ARMEABI.toBoolean()) {
         exclude 'lib/armeabi/*'
       }
@@ -89,6 +90,7 @@ android {
           arguments "-DJS_ENGINE=V8",
                   "-DANDROID_CPP_FEATURES=rtti exceptions",
                   "-DANDROID_PLATFORM=android-21",
+                  "-DANDROID_STL=c++_shared",
                   "-DCMAKE_BUILD_TYPE=Release",
                   "-DV8_TAG=$V8_TAG",
                   "-DV8_RELEASE=$V8_RELEASE",
@@ -116,6 +118,7 @@ android {
           arguments "-DJS_ENGINE=V8",
                   "-DANDROID_CPP_FEATURES=rtti exceptions",
                   "-DANDROID_PLATFORM=android-21",
+                  "-DANDROID_STL=c++_shared",
                   "-DCMAKE_BUILD_TYPE=Debug",
                   "-DV8_TAG=$V8_TAG",
                   "-DV8_RELEASE=$V8_RELEASE",
@@ -145,7 +148,7 @@ android {
         java.exclude("com/tencent/mtt/supportui/**")
       }
 
-      jniLibs.srcDirs = ['libs']
+      jniLibs.srcDirs = ["${THIRD_PARTY_LIBRARY_PATH}/layout"]
     }
   }
 }