diff options
| author | Ying Wang <wangying@google.com> | 2014-03-08 05:46:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 05:46:48 +0000 |
| commit | 03230982691744839fa2795d6124f27d982fe9d5 (patch) | |
| tree | ee16861dbf467053ecf064a2340c9d697e4ab207 | |
| parent | 2901e0442ab63d3148b708e88f445acaf8d4dc15 (diff) | |
| parent | 71364f8c1e1bcc84375830dd5904dfe7cdfb5ed6 (diff) | |
am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PDK build.
* commit '71364f8c1e1bcc84375830dd5904dfe7cdfb5ed6':
Exclude the host aapt and aidl from PDK build.
| -rw-r--r-- | tools/aapt/Android.mk | 4 | ||||
| -rw-r--r-- | tools/aidl/Android.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 2949f8ecb521..806f8ff7a0d8 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -5,7 +5,7 @@ # # This tool is prebuilt if we're doing an app-only build. -ifeq ($(TARGET_BUILD_APPS),) +ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),) aapt_src_files := \ @@ -101,4 +101,4 @@ LOCAL_STATIC_LIBRARIES := \ include $(BUILD_EXECUTABLE) endif -endif # TARGET_BUILD_APPS +endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk index 77d46abf4881..efd60a2cda99 100644 --- a/tools/aidl/Android.mk +++ b/tools/aidl/Android.mk @@ -3,7 +3,7 @@ # Copies files into the directory structure described by a manifest # This tool is prebuilt if we're doing an app-only build. -ifeq ($(TARGET_BUILD_APPS),) +ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -26,4 +26,4 @@ LOCAL_MODULE := aidl include $(BUILD_HOST_EXECUTABLE) -endif # TARGET_BUILD_APPS +endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK |