Build connectivity JNI against libc++_static
Instead of including the whole libc++ library by linking it dynamically,
use the static version so that unused symbols can be stripped.
This allows reducing the APEX size by 1MB (3.7MB -> 2.7MB), as otherwise
libc++ is included twice for 32 and 64 bit variants.
Bug: 171540887
Test: Device boots and has connectivity, size reduced
Change-Id: Ia66d795cf23d6f45997278300c103976433f7c5c
diff --git a/framework/Android.bp b/framework/Android.bp
index b0965bb..de71af4 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -141,6 +141,7 @@
"jni/onload.cpp",
],
shared_libs: ["libandroid"],
+ stl: "libc++_static",
apex_available: [
"//apex_available:platform",
"com.android.tethering",
diff --git a/service/Android.bp b/service/Android.bp
index 37dd9ff..05a8a4e 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -36,6 +36,7 @@
"jni/com_android_server_TestNetworkService.cpp",
"jni/onload.cpp",
],
+ stl: "libc++_static",
shared_libs: [
"libbase",
"liblog",