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

Commit 4d30e5e2 authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build] 

This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: Ie3f9292d35e9d4abf93271b7d22b72d185ee5ce2
parent 717bc3a3

CleanSpec.mk

+6 −0
Original line number Diff line number Diff line
@@ -247,6 +247,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) 


# Switch host builds to Clang by default

$(call add-clean-step, rm -rf $(OUT_DIR)/host)



# Adding dalvik.vm.dex2oat-filter

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/main.mk

+2 −2
Original line number Diff line number Diff line
@@ -378,9 +378,9 @@ ifneq ($(filter ro.setupwizard.mode=ENABLED, $(call collapse-pairs, $(ADDITIONAL 
          ro.setupwizard.mode=OPTIONAL

endif

# Don't even verify the image on eng builds to speed startup

ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-flags=--compiler-filter=verify-none

ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-filter=verify-none

# Don't compile apps on eng builds to speed startup

ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-flags=--compiler-filter=interpret-only

ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=interpret-only

endif



## sdk ##