diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-29 14:38:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 14:38:15 +0000 |
| commit | bb4ed9aa3aec4b787c8cd5e4f04b7f95302b76f9 (patch) | |
| tree | b4ed624379be0c71be7a9d9b93845584cf3fbcc6 | |
| parent | 2d954c7b46b40033161f61bebfad213f97821a8d (diff) | |
| parent | 815d9bb178a0488ed1579cd230d447630ad0891b (diff) | |
am 815d9bb1: Merge "Add a static dependency on libbase."
* commit '815d9bb178a0488ed1579cd230d447630ad0891b':
Add a static dependency on libbase.
| -rw-r--r-- | libs/androidfw/Android.mk | 2 | ||||
| -rw-r--r-- | tools/aapt/Android.mk | 3 | ||||
| -rw-r--r-- | tools/split-select/Android.mk | 3 |
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 |