diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 10:22:49 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-11-17 17:49:51 -0800 |
| commit | ef8a940f78edb3ea5d68f8e156c70f384a852d22 (patch) | |
| tree | c7e244404f17d950ad9af8dc48d281a6dd49eda1 /core/dex_preopt.mk | |
| parent | 8df7653d5608e5d459758a91e6c677c7d5fcc43f (diff) | |
| download | build-ef8a940f78edb3ea5d68f8e156c70f384a852d22.zip build-ef8a940f78edb3ea5d68f8e156c70f384a852d22.tar.gz build-ef8a940f78edb3ea5d68f8e156c70f384a852d22.tar.bz2 | |
Remove libdvm dex preopt support.
libdvm is dead.
Change-Id: Ib8571c007f8a9f0e0eaf5c61b5d2e416b2d95089
Diffstat (limited to 'core/dex_preopt.mk')
| -rw-r--r-- | core/dex_preopt.mk | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 72cb9f0..231a04e 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -46,25 +46,11 @@ endef $(foreach b,$(DEXPREOPT_BOOT_JARS_MODULES),$(eval $(call _dexpreopt-boot-jar-remove-classes.dex,$(b)))) -# Conditionally include Dalvik support. -ifeq ($(DALVIK_VM_LIB),libdvm.so) -include $(BUILD_SYSTEM)/dex_preopt_libdvm.mk -endif - -# Unconditionally include ART support because its used run dex2oat on the host for tests. include $(BUILD_SYSTEM)/dex_preopt_libart.mk # Define dexpreopt-one-file based on current default runtime. # $(1): the input .jar or .apk file # $(2): the output .odex file -ifeq ($(DALVIK_VM_LIB),libdvm.so) -define dexpreopt-one-file -$(call dexopt-one-file,$(1),$(2)) -endef - -DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS := $(DEXOPT_DEPENDENCY) -DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $(DEXPREOPT_BOOT_ODEXS) -else define dexpreopt-one-file $(call dex2oat-one-file,$(1),$(2)) endef @@ -74,7 +60,6 @@ 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 -endif # DALVIK_VM_LIB else $(warning No DALVIK_VM_LIB, disable dexpreopt.) WITH_DEXPREOPT := false |