diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-16 16:33:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-16 16:33:24 +0000 |
| commit | 1cd44482db83f51da9c8988b69bd8d13e3f6ba84 (patch) | |
| tree | f974fa51660a220d5759a99def5c9c2c288298b9 | |
| parent | 5576f9a6ca972d6cd1adbdf80752a486e5f8b26e (diff) | |
| parent | 35ab4203ef8e0cfeba7f69a6fe362998a02a5b72 (diff) | |
| download | build-o-mr1-iot-preview-8.tar.gz | |
Merge "Revert "Build: Support for compiled-classes file""android-o-mr1-iot-preview-8o-mr1-iot-preview-8
| -rw-r--r-- | core/dex_preopt_libart.mk | 4 | ||||
| -rw-r--r-- | core/dex_preopt_libart_boot.mk | 11 | ||||
| -rw-r--r-- | target/product/base.mk | 5 |
3 files changed, 2 insertions, 18 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index f289c22336..d8ab4168e6 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -20,10 +20,6 @@ PATCHOAT_DEPENDENCY += $(PATCHOAT) PRELOADED_CLASSES := $(call word-colon,1,$(firstword \ $(filter %system/etc/preloaded-classes,$(PRODUCT_COPY_FILES)))) -# Use the first compiled-classes file in PRODUCT_COPY_FILES. -COMPILED_CLASSES := $(call word-colon,1,$(firstword \ - $(filter %system/etc/compiled-classes,$(PRODUCT_COPY_FILES)))) - # Use the first dirty-image-objects file in PRODUCT_COPY_FILES. DIRTY_IMAGE_OBJECTS := $(call word-colon,1,$(firstword \ $(filter %system/etc/dirty-image-objects,$(PRODUCT_COPY_FILES)))) diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index a5e7e881ad..29584b1f13 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -33,12 +33,6 @@ $(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_EXTRA_INSTALLED_FILES := $(addprefix $(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_VDEX_INSTALLED_FILES := $(addprefix $(dir $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)),\ $(LIBART_TARGET_BOOT_ART_VDEX_FILES)) -# If we have a compiled-classes file, create a parameter. -COMPILED_CLASSES_FLAGS := -ifneq ($(COMPILED_CLASSES),) - COMPILED_CLASSES_FLAGS := --compiled-classes=$(COMPILED_CLASSES) -endif - # If we have a dirty-image-objects file, create a parameter. DIRTY_IMAGE_OBJECTS_FLAGS := ifneq ($(DIRTY_IMAGE_OBJECTS),) @@ -59,8 +53,7 @@ $($(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_EXTRA_INSTALLED_FILES) : $($(my_2n $(hide) $(ACP) -fp $(dir $<)$(notdir $@) $@ ifeq (,$(my_out_boot_image_profile_location)) -my_boot_image_flags := $(COMPILED_CLASSES_FLAGS) -my_boot_image_flags += --image-classes=$(PRELOADED_CLASSES) +my_boot_image_flags := --image-classes=$(PRELOADED_CLASSES) my_boot_image_flags += $(DIRTY_IMAGE_OBJECTS_FLAGS) else my_boot_image_flags := --compiler-filter=speed-profile @@ -94,7 +87,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_BOOT_IM $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_2ND_ARCH_VAR_PREFIX := $(my_2nd_arch_prefix) $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_IMAGE_LOCATION := $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION) # Use dex2oat debug version for better error reporting -$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGET_BOOT_DEX_FILES) $(PRELOADED_CLASSES) $(COMPILED_CLASSES) $(DIRTY_IMAGE_OBJECTS) $(DEX2OAT_DEPENDENCY) $(PATCHOAT_DEPENDENCY) $(my_out_boot_image_profile_location) +$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGET_BOOT_DEX_FILES) $(PRELOADED_CLASSES) $(DIRTY_IMAGE_OBJECTS) $(DEX2OAT_DEPENDENCY) $(PATCHOAT_DEPENDENCY) $(my_out_boot_image_profile_location) @echo "target dex2oat: $@" @mkdir -p $(dir $@) @mkdir -p $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED)) diff --git a/target/product/base.mk b/target/product/base.mk index 76a8c40215..e778e767f3 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -162,11 +162,6 @@ PRODUCT_PACKAGES_DEBUG_ASAN := PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\ frameworks/base/config/preloaded-classes:system/etc/preloaded-classes) -# Note: it is acceptable to not have a compiled-classes file. In that case, all boot classpath -# classes will be compiled. -PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ - frameworks/base/config/compiled-classes:system/etc/compiled-classes) - # Note: it is acceptable to not have a dirty-image-objects file. In that case, the special bin # for known dirty objects in the image will be empty. PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ |