diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Android.mk | 27 | ||||
| -rw-r--r-- | tools/aapt2/Android.mk | 3 | ||||
| -rw-r--r-- | tools/split-select/Android.mk | 3 |
3 files changed, 6 insertions, 27 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 9956bd7..bbe6860 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 @@ -131,28 +132,4 @@ LOCAL_STATIC_LIBRARIES += libaapt $(aaptHostStaticLibs) include $(BUILD_HOST_NATIVE_TEST) -# ========================================================== -# Build the device executable: aapt -# ========================================================== -ifneq ($(SDK_ONLY),true) -include $(CLEAR_VARS) - -LOCAL_MODULE := aapt -LOCAL_CFLAGS += $(aaptCFlags) -LOCAL_SRC_FILES := $(aaptSources) $(aaptMain) -LOCAL_C_INCLUDES += $(aaptCIncludes) -LOCAL_SHARED_LIBRARIES := \ - libandroidfw \ - libutils \ - libcutils \ - libpng \ - liblog \ - libz -LOCAL_STATIC_LIBRARIES := \ - libexpat_static - -include $(BUILD_EXECUTABLE) - -endif # Not SDK_ONLY - endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk index f3cf3c7..5ef4311 100644 --- a/tools/aapt2/Android.mk +++ b/tools/aapt2/Android.mk @@ -90,7 +90,8 @@ hostStaticLibs := \ libcutils \ libexpat \ libziparchive-host \ - libpng + libpng \ + libbase ifneq ($(strip $(USE_MINGW)),) hostStaticLibs += libz 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 @@ hostStaticLibs := \ libutils \ libcutils \ libexpat \ - libziparchive-host + libziparchive-host \ + libbase cFlags := -Wall -Werror |