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

Turn dalvikvm host builds on by default when linux is the host OS. 

Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.

Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
This commit is contained in:
Jesse Wilson 2010-09-22 10:59:10 -07:00
parent 780c237270
commit ce7d5023c3
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/envsetup.mk
View File

@ -119,6 +119,11 @@ else
HOST_PREBUILT_TAG := $(HOST_OS)-$(HOST_ARCH)
endif
# Build dalvikvm on hosts that support it
ifeq ($(HOST_OS),linux)
WITH_HOST_DALVIK := true
endif
# ---------------------------------------------------------------
# Set up configuration for target machine.

5
core/main.mk
View File

@ -225,11 +225,6 @@ ifneq (,$(user_variant))
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

8
target/product/core.mk
View File

@ -74,14 +74,6 @@ PRODUCT_PACKAGES := \
DefaultContainerService \
Bugreport
# force WITH_HOST_DALVIK on userdebug and user builds.
# TODO: this is redundant with a similar clause in build/core/main.mk.
ifneq (,$(filter userdebug user,$(TARGET_BUILD_VARIANT)))
ifeq ($(HOST_OS),linux)
WITH_HOST_DALVIK := true
endif
endif
# host-only dependencies
ifeq ($(WITH_HOST_DALVIK),true)
PRODUCT_PACKAGES += \