StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 9b80095e to lmp-dev-plus-aosp

Browse Source 
Change-Id: Id37b96441818c5542b8c340f968183162a47191a
This commit is contained in:
Brian Carlstrom
2014-08-04 12:21:46 -07:00
parent 70c6e14492 9b80095e6c
commit 479eca858c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CleanSpec.mk
View File

@@ -287,6 +287,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system)
# Switch host builds to Clang by default # Switch host builds to Clang by default
$(call add-clean-step, rm -rf $(OUT_DIR)/host) $(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 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

4
core/main.mk
View File

@@ -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 ##