From 377878b4d4529c0007694821ec96b20f0a489239 Mon Sep 17 00:00:00 2001
From: Jaekyun Seok <jaekyun@google.com>
Date: Wed, 23 Nov 2016 16:28:34 +0900
Subject: [PATCH] Remove static link in Android framework under
 /frameworks/base.

The dependencies to static libraries in frameworks should be removed
as many as possible to reduce a size of the system partition.
And that will improve coverage of the VNDK libraries because this
effort might find new necessary shared libs which were linked
statically before.

Size diffs of libs in /system/lib on angler-userdebug build are as
following.

libandroidfw.so      : 243748 -> 205196 (-38552)
libhwui.so           : 562028 -> 562580 (+552)
libmedia_jni.so      : 293652 -> 293656 (+4)
(All the others have the same size.)

total: (-37996)

Test: building succeeded, and the image was tested on angler.
Bug: 33056637
Change-Id: I3021fb438778eaea2be935b990ec85c4aec6c008
(cherry picked from commit 2b14c5eaf61635d1c3a69a2e59faa23cb6b7f7cb)
---
 libs/androidfw/Android.mk    | 3 ++-
 services/core/jni/Android.mk | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk
index 76d521dde04a0..9636ea72f47d4 100644
--- a/libs/androidfw/Android.mk
+++ b/libs/androidfw/Android.mk
@@ -64,8 +64,9 @@ LOCAL_MODULE:= libandroidfw
 LOCAL_SRC_FILES:= $(deviceSources)
 LOCAL_C_INCLUDES := \
     system/core/include
-LOCAL_STATIC_LIBRARIES := libziparchive libbase
 LOCAL_SHARED_LIBRARIES := \
+    libziparchive \
+    libbase \
     libbinder \
     liblog \
     libcutils \
diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk
index ac55a7eec21c5..0dbfa5674b5d4 100644
--- a/services/core/jni/Android.mk
+++ b/services/core/jni/Android.mk
@@ -52,6 +52,7 @@ LOCAL_C_INCLUDES += \
 LOCAL_SHARED_LIBRARIES += \
     libandroid_runtime \
     libandroidfw \
+    libbase \
     libbinder \
     libcutils \
     liblog \