am c955834a: am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"

Merge commit 'c955834ad0715343a2245142be416f92b83e8306' into gingerbread-plus-aosp

* commit 'c955834ad0715343a2245142be416f92b83e8306':
  default empty tapas to TARGET_BUILD_APPS "all"
This commit is contained in:
Ying Wang
2010-06-24 18:02:17 -07:00
committed by Android Git Automerger
2 changed files with 5 additions and 2 deletions

View File

@@ -688,8 +688,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

View File

@@ -559,6 +559,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