Merge "Build connectivity JNI against libc++_static" am: 84061f6102

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722743 Change-Id: I98d0450ca8da40bde399028162a9d30a897903d8
2021-06-04 07:26:26 +00:00
parent ab6817ffa2 84061f6102
commit 70212c3310
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",