diff options
author | Narayan Kamath <narayan@google.com> | 2015-01-22 18:53:59 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2015-01-22 18:53:59 +0000 |
commit | 675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8 (patch) | |
tree | 1277544d3f6326a58a7ab5cd5c74eb44c8ef6319 /CleanSpec.mk | |
parent | 30a0031e4388a54890071e7c386b20c81509f27f (diff) | |
parent | 8f5fc9e246e3ecebbb4cf4768da027e6e34d40d5 (diff) | |
download | build-675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8.zip build-675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8.tar.gz build-675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8.tar.bz2 |
resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
Diffstat (limited to 'CleanSpec.mk')
-rw-r--r-- | CleanSpec.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index fc908de..5b18d44 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -325,6 +325,10 @@ $(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/*) +# Remove ro.product.locale.language/country and add ro.product.locale +# instead. +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ |