resolved conflicts for merge of ebc32090
to lmp-mr1-dev-plus-aosp
Change-Id: Icfa9c3424a2e75a07eaa453663b03a12897809a9
This commit is contained in:
commit
420773ae53
|
@ -307,6 +307,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
|
|||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
|
||||
|
||||
# Move to libc++ as the default STL.
|
||||
$(call add-clean-step, rm -rf $(OUT_DIR))
|
||||
|
||||
# ************************************************
|
||||
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||
# ************************************************
|
||||
|
|
Loading…
Reference in New Issue