resolved conflicts for merge of 0f99bb3d
to klp-modular-dev-plus-aosp
Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f
This commit is contained in:
@@ -234,6 +234,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/*)
|
||||
|
||||
# Unset TARGET_PREFER_32_BIT_APPS for 64 bit targets.
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
|
||||
|
||||
# ************************************************
|
||||
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||
# ************************************************
|
||||
|
Reference in New Issue
Block a user