summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2015-04-28 09:23:26 +0100
committer Narayan Kamath <narayan@google.com> 2015-04-29 14:07:41 +0000
commit9c8ba9666d2fad27baae11e56d63485a22812d17 (patch)
treec8f748f6d9a2ba3cb440266a02abb1f24617aa47
parentadbbba9f1dc364e4d3911562fdb8f2e666922e2f (diff)
Add a static dependency on libbase.
Used by libziparchive. Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3
-rw-r--r--libs/androidfw/Android.mk2
-rw-r--r--tools/aapt/Android.mk3
-rw-r--r--tools/split-select/Android.mk3
3 files changed, 5 insertions, 3 deletions
diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk
index 461160ad7336..2f287000f746 100644
--- 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 \
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 9956bd7a8cc1..dc3ad255be04 100644
--- 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
diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk
index 013e570fc35e..d9ddf08862b3 100644
--- 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