diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-11 16:20:16 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-11 16:21:19 -0700 |
| commit | 88ba339aefd74ffe0ea978ebb659a430f82940f0 (patch) | |
| tree | d10fa776649804e7b225f832a975a9814e66bb93 /tools/aapt | |
| parent | bcaaebb8a881951720190f4a6b9ffcbf871542af (diff) | |
| download | frameworks_base-88ba339aefd74ffe0ea978ebb659a430f82940f0.zip frameworks_base-88ba339aefd74ffe0ea978ebb659a430f82940f0.tar.gz frameworks_base-88ba339aefd74ffe0ea978ebb659a430f82940f0.tar.bz2 | |
Clean up makefile cruft.
The build system already takes care of all these things.
Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/Android.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 2949f8e..162edc4 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -31,6 +31,7 @@ aapt_src_files := \ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SRC_FILES := $(aapt_src_files) @@ -73,14 +74,12 @@ include $(BUILD_HOST_EXECUTABLE) # ========================================================= ifneq ($(SDK_ONLY),true) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SRC_FILES := $(aapt_src_files) LOCAL_MODULE := aapt -LOCAL_C_INCLUDES += bionic -LOCAL_C_INCLUDES += bionic/libstdc++/include -LOCAL_C_INCLUDES += external/stlport/stlport LOCAL_C_INCLUDES += external/libpng LOCAL_C_INCLUDES += external/zlib @@ -95,9 +94,9 @@ LOCAL_SHARED_LIBRARIES := \ libz LOCAL_STATIC_LIBRARIES := \ - libstlport_static \ libexpat_static +include external/stlport/libstlport.mk include $(BUILD_EXECUTABLE) endif |