summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-04-29 14:38:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 14:38:15 +0000
commitbb4ed9aa3aec4b787c8cd5e4f04b7f95302b76f9 (patch)
treeb4ed624379be0c71be7a9d9b93845584cf3fbcc6 /tools/aapt
parent2d954c7b46b40033161f61bebfad213f97821a8d (diff)
parent815d9bb178a0488ed1579cd230d447630ad0891b (diff)
downloadframeworks_base-bb4ed9aa3aec4b787c8cd5e4f04b7f95302b76f9.zip
frameworks_base-bb4ed9aa3aec4b787c8cd5e4f04b7f95302b76f9.tar.gz
frameworks_base-bb4ed9aa3aec4b787c8cd5e4f04b7f95302b76f9.tar.bz2
am 815d9bb1: Merge "Add a static dependency on libbase."
* commit '815d9bb178a0488ed1579cd230d447630ad0891b': Add a static dependency on libbase.
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/Android.mk3
1 files changed, 2 insertions, 1 deletions
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 @@ aaptHostStaticLibs := \
libutils \
libcutils \
libexpat \
- libziparchive-host
+ libziparchive-host \
+ libbase
aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"
aaptCFlags += -Wall -Werror