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

Commit 7b93109e authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android Git Automerger
Browse files

am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 

* commit 'd7f3d8ba':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
parents e0881796 d7f3d8ba

CleanSpec.mk

+5 −0
Original line number Diff line number Diff line
@@ -334,6 +334,11 @@ $(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)



# Rename dalvik.vm.usejit to debug.dalvik.vm.usejit

$(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

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ ifndef is_sdk_build 
  # Don't compile apps on eng builds to speed startup

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

endif

  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.usejit=true

  ADDITIONAL_BUILD_PROPERTIES += debug.dalvik.vm.usejit=true

endif



## sdk ##