Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce7d5023 authored by Jesse Wilson's avatar Jesse Wilson
Browse files

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
parent 780c2372

core/envsetup.mk

+5 −0
Original line number Diff line number Diff line
@@ -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.

core/main.mk

+0 −5
Original line number Diff line number Diff line
@@ -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

target/product/core.mk

+0 −8
Original line number Diff line number Diff line
@@ -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 += \