diff options
| author | Joe Onorato <joeo@android.com> | 2010-06-15 15:49:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-15 15:49:05 -0700 |
| commit | 6b56a84ace800811aec7e42e70bb3bfd8f6e809e (patch) | |
| tree | dbfedb48619d70550fee3b8abed7ac2c77e8d16b | |
| parent | afcc0f88741b336fe5f3cb26c2eb5b30447ecfa3 (diff) | |
| parent | 3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28 (diff) | |
| download | frameworks_base-6b56a84ace800811aec7e42e70bb3bfd8f6e809e.zip frameworks_base-6b56a84ace800811aec7e42e70bb3bfd8f6e809e.tar.gz frameworks_base-6b56a84ace800811aec7e42e70bb3bfd8f6e809e.tar.bz2 | |
am 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28'
* commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
| -rw-r--r-- | tools/aapt/Android.mk | 4 | ||||
| -rw-r--r-- | tools/aidl/Android.mk | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 499a7ac..b339a2c 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -4,6 +4,9 @@ # Android Asset Packaging Tool # +# This tool is prebuilt if we're doing an app-only build. +ifeq ($(TARGET_BUILD_APPS),) + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -53,3 +56,4 @@ LOCAL_MODULE := aapt include $(BUILD_HOST_EXECUTABLE) +endif # TARGET_BUILD_APPS diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk index 944aeb6..2ad0728 100644 --- a/tools/aidl/Android.mk +++ b/tools/aidl/Android.mk @@ -2,6 +2,9 @@ # # 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),) + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -21,4 +24,4 @@ LOCAL_MODULE := aidl include $(BUILD_HOST_EXECUTABLE) - +endif # TARGET_BUILD_APPS |