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

am: ae21f6f5b0

Change-Id: Ie0306a1e3dc80f6ee6ad9669b91d150167b04586
This commit is contained in:
Jaekyun Seok
2016-12-02 19:51:59 +00:00
committed by android-build-merger
2 changed files with 3 additions and 1 deletions

View File

@@ -64,8 +64,9 @@ LOCAL_MODULE:= libandroidfw
LOCAL_SRC_FILES:= $(deviceSources) LOCAL_SRC_FILES:= $(deviceSources)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/core/include system/core/include
LOCAL_STATIC_LIBRARIES := libziparchive libbase
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libziparchive \
libbase \
libbinder \ libbinder \
liblog \ liblog \
libcutils \ libcutils \

View File

@@ -52,6 +52,7 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES += \ LOCAL_SHARED_LIBRARIES += \
libandroid_runtime \ libandroid_runtime \
libandroidfw \ libandroidfw \
libbase \
libbinder \ libbinder \
libcutils \ libcutils \
liblog \ liblog \