am ea79e65f: Merge change Ib7704386 into eclair

Merge commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9' into eclair-mr2

* commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9':
  BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
This commit is contained in:
Joe Onorato 2009-10-06 11:00:28 -07:00 committed by Android Git Automerger
commit f13231ef8a

View file

@ -21,6 +21,30 @@
# "buildspec.mk" should never be checked in to source control. # "buildspec.mk" should never be checked in to source control.
###################################################################### ######################################################################
# Choose a product to build for. Look in the products directory for ones
# that work.
ifndef TARGET_PRODUCT
#TARGET_PRODUCT:=generic
endif
# Choose a variant to build. If you don't pick one, the default is eng.
# User is what we ship. Userdebug is that, with a few flags turned on
# for debugging. Eng has lots of extra tools for development.
ifndef TARGET_BUILD_VARIANT
#TARGET_BUILD_VARIANT:=user
#TARGET_BUILD_VARIANT:=userdebug
#TARGET_BUILD_VARIANT:=eng
endif
# Choose additional targets to always install, even when building
# minimal targets like "make droid". This takes simple target names
# like "Browser" or "MyApp", the names used by LOCAL_MODULE or
# LOCAL_PACKAGE_NAME. Modules listed here will always be installed in
# /system, even if they'd usually go in /data.
ifndef CUSTOM_MODULES
#CUSTOM_MODULES:=
endif
# Uncomment this if you want the simulator, otherwise, build for arm # Uncomment this if you want the simulator, otherwise, build for arm
ifndef TARGET_SIMULATOR ifndef TARGET_SIMULATOR
#TARGET_SIMULATOR:=true #TARGET_SIMULATOR:=true
@ -50,21 +74,6 @@ endif
#HOST_CUSTOM_DEBUG_CFLAGS:= #HOST_CUSTOM_DEBUG_CFLAGS:=
#TARGET_CUSTOM_DEBUG_CFLAGS:= #TARGET_CUSTOM_DEBUG_CFLAGS:=
# Choose a product to build for. Look in the products directory for ones
# that work.
ifndef TARGET_PRODUCT
#TARGET_PRODUCT:=generic
endif
# Choose additional targets to always install, even when building
# minimal targets like "make droid". This takes simple target names
# like "Browser" or "MyApp", the names used by LOCAL_MODULE or
# LOCAL_PACKAGE_NAME. Modules listed here will always be installed in
# /system, even if they'd usually go in /data.
ifndef CUSTOM_MODULES
#CUSTOM_MODULES:=
endif
# Choose additional locales, like "en_US" or "it_IT", to add to any # Choose additional locales, like "en_US" or "it_IT", to add to any
# built product. Any locales that appear in CUSTOM_LOCALES but not in # built product. Any locales that appear in CUSTOM_LOCALES but not in
# the locale list for the selected product will be added to the end # the locale list for the selected product will be added to the end