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

Commit cced082f 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

(cherry picked from commit 4d30e5e2)

Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
parent 56ef86df

CleanSpec.mk

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

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





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

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



# 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

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

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

core/main.mk

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

          ro.setupwizard.mode=OPTIONAL

endif

endif

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

# 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

# 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

endif





## sdk ##

## sdk ##