commit 9c8ba9666d2fad27baae11e56d63485a22812d17
author Narayan Kamath <narayan@google.com> Tue Apr 28 09:23:26 2015 +0100
committer Narayan Kamath <narayan@google.com> Wed Apr 29 14:07:41 2015 +0000
tree c8f748f6d9a2ba3cb440266a02abb1f24617aa47
parent adbbba9f1dc364e4d3911562fdb8f2e666922e2f

Add a static dependency on libbase.

Used by libziparchive.

Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3

libs/androidfw/Android.mk

diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk
index 461160a..2f28700 100644
--- a/libs/androidfw/Android.mk
+++ b/libs/androidfw/Android.mk
@@ -64,7 +64,7 @@
 LOCAL_C_INCLUDES := \
     external/zlib \
     system/core/include
-LOCAL_STATIC_LIBRARIES := libziparchive
+LOCAL_STATIC_LIBRARIES := libziparchive libbase
 LOCAL_SHARED_LIBRARIES := \
     libbinder \
     liblog \

tools/aapt/Android.mk

diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 9956bd7..dc3ad25 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -64,7 +64,8 @@
     libutils \
     libcutils \
     libexpat \
-    libziparchive-host
+    libziparchive-host \
+    libbase
 
 aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"
 aaptCFlags += -Wall -Werror

tools/split-select/Android.mk

diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk
index 013e570..d9ddf08 100644
--- a/tools/split-select/Android.mk
+++ b/tools/split-select/Android.mk
@@ -52,7 +52,8 @@
     libutils \
     libcutils \
     libexpat \
-    libziparchive-host
+    libziparchive-host \
+    libbase
 
 cFlags := -Wall -Werror