From b2abc42c20b924bc6e400a5cb602c12869afe3ca Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Wed, 24 Mar 2021 01:49:39 +0000
Subject: [PATCH] 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
---
 packages/Connectivity/framework/Android.bp | 1 +
 packages/Connectivity/service/Android.bp   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/Connectivity/framework/Android.bp b/packages/Connectivity/framework/Android.bp
index b0965bb44b906..de71af49f86aa 100644
--- a/packages/Connectivity/framework/Android.bp
+++ b/packages/Connectivity/framework/Android.bp
@@ -141,6 +141,7 @@ cc_library_shared {
         "jni/onload.cpp",
     ],
     shared_libs: ["libandroid"],
+    stl: "libc++_static",
     apex_available: [
         "//apex_available:platform",
         "com.android.tethering",
diff --git a/packages/Connectivity/service/Android.bp b/packages/Connectivity/service/Android.bp
index 37dd9ff84b591..05a8a4eec5e45 100644
--- a/packages/Connectivity/service/Android.bp
+++ b/packages/Connectivity/service/Android.bp
@@ -36,6 +36,7 @@ cc_library_shared {
         "jni/com_android_server_TestNetworkService.cpp",
         "jni/onload.cpp",
     ],
+    stl: "libc++_static",
     shared_libs: [
         "libbase",
         "liblog",