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

Commit d54520a6 authored by Ying Wang's avatar Ying Wang
Browse files

Remove libdvm support from the core build system. 

Now libart is the only supported runtime and
we don't need the build variables PRODUCT_RUNTIMES and
DALVIK_VM_LIB.

Bug: 18465297
Change-Id: Ibfda931cde0649163d79b584fb5ccad927a9bc2b
parent 91e724d4

core/dex_preopt.mk

+3 −6
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
#

####################################



ifneq ($(DALVIK_VM_LIB),)



# list of boot classpath jars for dexpreopt

DEXPREOPT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS))

DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS)
@@ -18,6 +16,9 @@ DEXPREOPT_PRODUCT_DIR := $(patsubst $(DEXPREOPT_BUILD_DIR)/%,%,$(DEXPREOPT_PRODU 
DEXPREOPT_BOOT_JAR_DIR := system/framework

DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREOPT_BOOT_JAR_DIR)



# The default value for LOCAL_DEX_PREOPT

DEX_PREOPT_DEFAULT ?= true



# $(1): the .jar or .apk to remove classes.dex

define dexpreopt-remove-classes.dex

$(hide) zip --quiet --delete $(1) classes.dex; \
@@ -60,7 +61,3 @@ DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $(DEFAULT_DEX_PREOPT_BUILT_IM 
ifdef TARGET_2ND_ARCH

$(TARGET_2ND_ARCH_VAR_PREFIX)DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME)

endif  # TARGET_2ND_ARCH
 
else

$(warning No DALVIK_VM_LIB, disable dexpreopt.)

WITH_DEXPREOPT := false

endif  # DALVIK_VM_LIB is defined.

core/dex_preopt_odex_install.mk

+0 −15
Original line number Diff line number Diff line
@@ -50,26 +50,12 @@ built_installed_odex := 
ifdef LOCAL_DEX_PREOPT

dexpreopt_boot_jar_module := $(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE))

ifdef dexpreopt_boot_jar_module

ifeq ($(DALVIK_VM_LIB),libdvm.so)

built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex

installed_odex := $(basename $(LOCAL_INSTALLED_MODULE)).odex

built_installed_odex := $(built_odex):$(installed_odex)

else # libdvm.so

# For libart, the boot jars' odex files are replaced by $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE).

# We use this installed_odex trick to get boot.art installed.

installed_odex := $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)

# Append the odex for the 2nd arch if we have one.

installed_odex += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)

endif # libdvm.so

else  # boot jar

ifeq ($(DALVIK_VM_LIB),libdvm.so)

built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex

installed_odex := $(basename $(LOCAL_INSTALLED_MODULE)).odex

built_installed_odex := $(built_odex):$(installed_odex)



$(built_odex) : $(DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT) \

                $(DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS)

else # libart

ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)

# For a Java library, we build odex for both 1st arch and 2nd arch, if we have one.

# #################################################
@@ -95,7 +81,6 @@ include $(BUILD_SYSTEM)/setup_one_odex.mk 
endif  # LOCAL_MULTILIB is both

endif  # TARGET_2ND_ARCH

endif  # LOCAL_MODULE_CLASS

endif  # libart

endif  # boot jar



ifdef built_odex

core/java_library.mk

+0 −6
Original line number Diff line number Diff line
@@ -85,12 +85,6 @@ $(LOCAL_BUILT_MODULE) : $(dexpreopted_boot_jar) | $(ACP) 
	$(call copy-file-to-target)



# For libart boot jars, we don't have .odex files.

ifeq ($(DALVIK_VM_LIB),libdvm.so)

dexpreopted_boot_odex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(dexpreopt_boot_jar_module).odex

$(built_odex) : $(dexpreopted_boot_odex) | $(ACP)

	$(call copy-file-to-target)

endif



else # ! boot jar

$(built_odex): PRIVATE_MODULE := $(LOCAL_MODULE)

# Use pattern rule - we may have multiple built odex files.

core/main.mk

+6 −6
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ endif 


# Add build properties for ART. These define system properties used by installd

# to pass flags to dex2oat.

ADDITIONAL_BUILD_PROPERTIES += persist.sys.dalvik.vm.lib.2=libart

ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).variant=$(DEX2OAT_TARGET_CPU_VARIANT)

ifneq ($(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES),)

  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)
@@ -336,15 +337,14 @@ ifneq (,$(user_variant)) 
    enable_target_debugging :=

  endif



  # Turn on Dalvik preoptimization for libdvm.so user builds, but only if not

  # Turn on Dalvik preoptimization for user builds, but only if not

  # explicitly disabled and the build is running on Linux (since host

  # Dalvik isn't built for non-Linux hosts).

  ifeq (,$(WITH_DEXPREOPT))

    ifeq ($(DALVIK_VM_LIB),libdvm.so)

    ifeq ($(user_variant),user)

      ifeq ($(HOST_OS),linux)

          WITH_DEXPREOPT := true

        endif

        # TODO: turn on WITH_DEXPREOPT for libart user builds.

        # WITH_DEXPREOPT := true

      endif

    endif

  endif

core/product.mk

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ _product_var_list := \ 
    PRODUCT_VENDOR_KERNEL_HEADERS \

    PRODUCT_FACTORY_RAMDISK_MODULES \

    PRODUCT_FACTORY_BUNDLE_MODULES \

    PRODUCT_RUNTIMES \

    PRODUCT_BOOT_JARS \

    PRODUCT_SUPPORTS_VERITY \

    PRODUCT_OEM_PROPERTIES \