Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a5fcd1c authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an... 

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 '9d71860e' into gingerbread

* commit '9d71860e':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
parents ac8b0d47 9d71860e

tools/aapt/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

tools/aidl/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -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