Merge "Add a static dependency on libbase."

2015-04-29 14:09:03 +00:00
parent adbbba9f1d 9c8ba9666d
commit 815d9bb178
3 changed files with 5 additions and 3 deletions
--- a/libs/androidfw/Android.mk
+++ b/libs/androidfw/Android.mk
@@ -64,7 +64,7 @@ LOCAL_SRC_FILES:= $(deviceSources)
 LOCAL_C_INCLUDES := \
    external/zlib \
    system/core/include
-LOCAL_STATIC_LIBRARIES := libziparchive
+LOCAL_STATIC_LIBRARIES := libziparchive libbase
 LOCAL_SHARED_LIBRARIES := \
    libbinder \
    liblog \
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -64,7 +64,8 @@ aaptHostStaticLibs := \
    libutils \
    libcutils \
    libexpat \
-    libziparchive-host
+    libziparchive-host \
+    libbase

 aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"
 aaptCFlags += -Wall -Werror
--- a/tools/split-select/Android.mk
+++ b/tools/split-select/Android.mk
@@ -52,7 +52,8 @@ hostStaticLibs := \
    libutils \
    libcutils \
    libexpat \
-    libziparchive-host
+    libziparchive-host \
+    libbase

 cFlags := -Wall -Werror