tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread

Browse source 
Merge commit 'ca917dc2b2140b9fc4e331f94907cd27c8b6a91f' into gingerbread-plus-aosp

* commit 'ca917dc2b2140b9fc4e331f94907cd27c8b6a91f':
  Enable WITH_HOST_DALVIK for "user" builds on Linux.
This commit is contained in:
Dan Bornstein 2010-09-08 14:34:21 -07:00 committed by Android Git Automerger
commit 3177afa817
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/main.mk
View file

@ -217,16 +217,22 @@ ifneq (,$(user_variant))
# Disable debugging in plain user builds.
enable_target_debugging :=
endif
# TODO: Always set WITH_DEXPREOPT (for user builds) once it works on OSX.
# Also, remove the corresponding block in config/product_config.make.
# TODO: Remove this and the corresponding block in
# config/product_config.make once host-based Dalvik preoptimization is
# working.
ifeq ($(HOST_OS)-$(WITH_DEXPREOPT_buildbot),linux-true)
WITH_DEXPREOPT := true
endif
# TODO: Always set WITH_HOST_DALVIK (for user builds) once it works on OSX.
ifeq ($(HOST_OS),linux)
WITH_HOST_DALVIK := true
endif
# Disallow mock locations by default for user builds
ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0
else # !user_variant
# Turn on checkjni for non-user builds.
ADDITIONAL_BUILD_PROPERTIES += ro.kernel.android.checkjni=1

11
core/product_config.mk
View file

@ -119,12 +119,11 @@ ifdef product_goals
default_goal_substitution := $(DEFAULT_GOAL)
endif
# Hack to make the linux build servers use dexpreopt.
# OSX is still a little flaky. Most engineers don't use this
# type of target ("make PRODUCT-blah-user"), so this should
# only tend to happen when using buildbot.
# TODO: remove this and fix the matching lines in build/core/main.mk
# once dexpreopt works better on OSX.
# Hack to make the linux build servers use dexpreopt (emulator-based
# preoptimization). Most engineers don't use this type of target
# ("make PRODUCT-blah-user"), so this should only tend to happen when
# using buildbot.
# TODO: Remove this once host Dalvik preoptimization is working.
ifeq ($(TARGET_BUILD_VARIANT),user)
WITH_DEXPREOPT_buildbot := true
endif