Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '9a5fcd1c14dcea951099433885ed3519dee90f48' into gingerbread-plus-aosp

* commit '9a5fcd1c14dcea951099433885ed3519dee90f48':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
This commit is contained in:
Joe Onorato
2010-06-15 15:23:55 -07:00
committed by Android Git Automerger
parent 56b64c75c3 9a5fcd1c14
commit 3d6ea3bd86
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/Android.mk
View File

@@ -4,6 +4,9 @@
# Android Asset Packaging Tool # 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) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -53,3 +56,4 @@ LOCAL_MODULE := aapt
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
endif # TARGET_BUILD_APPS

5
tools/aidl/Android.mk
View File

@@ -2,6 +2,9 @@
# #
# Copies files into the directory structure described by a manifest # 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) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -21,4 +24,4 @@ LOCAL_MODULE := aidl
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
endif # TARGET_BUILD_APPS