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

Change-Id: Id37b96441818c5542b8c340f968183162a47191a
This commit is contained in:
Brian Carlstrom
2014-08-04 12:21:46 -07:00
2 changed files with 7 additions and 2 deletions

View File

@@ -287,6 +287,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system)
# 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
# ************************************************