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
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user