Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451

am: 5705ad69db Change-Id: I3f2c38332115a7b52b893629f2a5007d75c2831d
2016-12-02 19:43:36 +00:00
parent 652521ae7b 5705ad69db
commit ae21f6f5b0
2 changed files with 3 additions and 1 deletions
--- 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 \
--- 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 \