summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-03-07 15:55:14 -0800
committerYing Wang <wangying@google.com>2014-03-07 15:56:14 -0800
commit74bebf6faed2d34814ffc3d46664330ea568f7b2 (patch)
tree4c77c094ba71d651e37abda346444295724a3a76
parent01b5e765e59c14cdfb62f1a8684e9116a46874d2 (diff)
downloadframeworks_base-74bebf6faed2d34814ffc3d46664330ea568f7b2.zip
frameworks_base-74bebf6faed2d34814ffc3d46664330ea568f7b2.tar.gz
frameworks_base-74bebf6faed2d34814ffc3d46664330ea568f7b2.tar.bz2
Exclude the host aapt and aidl from PDK build.
Bug: 13028632 Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
-rw-r--r--tools/aapt/Android.mk4
-rw-r--r--tools/aidl/Android.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 2949f8e..806f8ff 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 77d46ab..efd60a2 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