resolved conflicts for merge of 636458dd
to eclair-mr2
This commit is contained in:
@@ -118,6 +118,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app)
|
|||||||
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
|
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
|
||||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
|
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
|
||||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/GoogleSubscribedFeedsProvider.apk)
|
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/GoogleSubscribedFeedsProvider.apk)
|
||||||
|
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
|
||||||
|
|
||||||
# ************************************************
|
# ************************************************
|
||||||
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||||
|
Reference in New Issue
Block a user