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

2016-12-02 19:21:46 +00:00
parent eda1af611f 377878b4d4
commit c60963e451
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 \