diff options
| author | Ying Wang <wangying@google.com> | 2014-12-16 21:38:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-16 21:38:41 +0000 |
| commit | 73a730caf566fb778ad36f6d991666c482918d22 (patch) | |
| tree | 668733c12401318fc3b40613a5672ecfe626d560 /core/dex_preopt_odex_install.mk | |
| parent | 8c5401c1c6a5dfd87c4b0f0edc45810e35b93e40 (diff) | |
| parent | d54520a667e3bd5c9f2abe98573a5de83bcf4872 (diff) | |
| download | build-73a730caf566fb778ad36f6d991666c482918d22.zip build-73a730caf566fb778ad36f6d991666c482918d22.tar.gz build-73a730caf566fb778ad36f6d991666c482918d22.tar.bz2 | |
Merge "Remove libdvm support from the core build system."
Diffstat (limited to 'core/dex_preopt_odex_install.mk')
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 20bbe78..aef5cd1 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -46,26 +46,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. # ################################################# @@ -91,7 +77,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 |