commit 47cc651269daf5cad9d5b739cb68cfb59ab3fed3
author Remi NGUYEN VAN <reminv@google.com> Wed Mar 24 01:49:39 2021 +0000
committer Remi NGUYEN VAN <reminv@google.com> Wed Mar 24 10:08:39 2021 +0000
tree 34f8be883ec4b878c7feef57603ad2c53213ecec
parent 6b0c4071332139a8eca10c5738d0c2b0818b4fef

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

framework/Android.bp

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",