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

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

Merge commit '3177afa8177d8b31dd6bd160816a11fedeec7e07'

* commit '3177afa8177d8b31dd6bd160816a11fedeec7e07':
  Enable WITH_HOST_DALVIK for "user" builds on Linux.
This commit is contained in:
Dan Bornstein 2010-09-08 14:38:03 -07:00 committed by Android Git Automerger
parent 38938d12e4 3177afa817
commit 29ff8c85c1
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. # Disable debugging in plain user builds.
enable_target_debugging := enable_target_debugging :=
endif endif
# TODO: Always set WITH_DEXPREOPT (for user builds) once it works on OSX. # TODO: Remove this and the corresponding block in
# Also, remove the corresponding block in config/product_config.make. # config/product_config.make once host-based Dalvik preoptimization is
# working.
ifeq ($(HOST_OS)-$(WITH_DEXPREOPT_buildbot),linux-true) ifeq ($(HOST_OS)-$(WITH_DEXPREOPT_buildbot),linux-true)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
endif 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 # Disallow mock locations by default for user builds
ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0 ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0
else # !user_variant else # !user_variant
# Turn on checkjni for non-user builds. # Turn on checkjni for non-user builds.
ADDITIONAL_BUILD_PROPERTIES += ro.kernel.android.checkjni=1 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) default_goal_substitution := $(DEFAULT_GOAL)
endif endif
# Hack to make the linux build servers use dexpreopt. # Hack to make the linux build servers use dexpreopt (emulator-based
# OSX is still a little flaky. Most engineers don't use this # preoptimization). Most engineers don't use this type of target
# type of target ("make PRODUCT-blah-user"), so this should # ("make PRODUCT-blah-user"), so this should only tend to happen when
# only tend to happen when using buildbot. # using buildbot.
# TODO: remove this and fix the matching lines in build/core/main.mk # TODO: Remove this once host Dalvik preoptimization is working.
# once dexpreopt works better on OSX.
ifeq ($(TARGET_BUILD_VARIANT),user) ifeq ($(TARGET_BUILD_VARIANT),user)
WITH_DEXPREOPT_buildbot := true WITH_DEXPREOPT_buildbot := true
endif endif