Merge "Build connectivity JNI against libc++_static"

2021-06-04 07:01:47 +00:00
parent 5d3005cc98 4be92df27b
commit 84061f6102
2 changed files with 2 additions and 0 deletions
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -137,6 +137,7 @@ cc_library_shared {
        "jni/onload.cpp",
    ],
    shared_libs: ["libandroid"],
+    stl: "libc++_static",
    apex_available: [
        "//apex_available:platform",
        "com.android.tethering",
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -32,6 +32,7 @@ cc_library_shared {
        "jni/com_android_server_TestNetworkService.cpp",
        "jni/onload.cpp",
    ],
+    stl: "libc++_static",
    shared_libs: [
        "libbase",
        "liblog",