p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

default empty tapas to TARGET_BUILD_APPS "all" 

So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.

Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
This commit is contained in:
Ying Wang 2010-06-24 15:08:33 -07:00
parent 3b85269cfe
commit c048c9b598
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/base_rules.mk
View File

@ -491,6 +491,8 @@ ALL_MODULES += $(LOCAL_MODULE)
# Don't use += on subvars, or else they'll end up being # Don't use += on subvars, or else they'll end up being
# recursively expanded. # recursively expanded.
ALL_MODULES.$(LOCAL_MODULE).CLASS := \
$(ALL_MODULES.$(LOCAL_MODULE).CLASS) $(LOCAL_MODULE_CLASS)
ALL_MODULES.$(LOCAL_MODULE).PATH := \ ALL_MODULES.$(LOCAL_MODULE).PATH := \
$(ALL_MODULES.$(LOCAL_MODULE).PATH) $(LOCAL_PATH) $(ALL_MODULES.$(LOCAL_MODULE).PATH) $(LOCAL_PATH)
ALL_MODULES.$(LOCAL_MODULE).TAGS := \ ALL_MODULES.$(LOCAL_MODULE).TAGS := \

5
core/main.mk
View File

@ -692,8 +692,8 @@ ifneq ($(TARGET_BUILD_APPS),)
unbundled_build_modules := unbundled_build_modules :=
ifneq ($(filter all,$(TARGET_BUILD_APPS)),) ifneq ($(filter all,$(TARGET_BUILD_APPS)),)
# If they used the magic goal "all" then build everything # If they used the magic goal "all" then build all apps in the source tree.
unbundled_build_modules := $(sort $(call get-tagged-modules,$(ALL_MODULE_TAGS))) unbundled_build_modules := $(foreach m,$(sort $(ALL_MODULES)),$(if $(filter APPS,$(ALL_MODULES.$(m).CLASS)),$(m)))
else else
unbundled_build_modules := $(TARGET_BUILD_APPS) unbundled_build_modules := $(TARGET_BUILD_APPS)
endif endif
@ -786,4 +786,3 @@ modules:
.PHONY: showcommands .PHONY: showcommands
showcommands: showcommands:
@echo >/dev/null @echo >/dev/null

3
envsetup.sh
View File

@ -546,6 +546,9 @@ function tapas()
if [ -z "$variant" ]; then if [ -z "$variant" ]; then
variant=eng variant=eng
fi fi
if [ -z "$apps" ]; then
apps=all
fi
export TARGET_PRODUCT=generic export TARGET_PRODUCT=generic
export TARGET_BUILD_VARIANT=$variant export TARGET_BUILD_VARIANT=$variant