diff options
author | Ying Wang <wangying@google.com> | 2010-10-07 15:24:44 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2010-10-07 15:24:44 -0700 |
commit | 4c5f5df2c22b7c4ac390508ee897412b4d48fda1 (patch) | |
tree | 4d793006d09c3e1c3b2ab8854f63c0db4aec437e /CleanSpec.mk | |
parent | c5696458d4ba28e375cf65b55f31537edbde0984 (diff) | |
parent | 222a835d28417a4f6c250bcdb844ae4b92369f78 (diff) | |
download | build-4c5f5df2c22b7c4ac390508ee897412b4d48fda1.zip build-4c5f5df2c22b7c4ac390508ee897412b4d48fda1.tar.gz build-4c5f5df2c22b7c4ac390508ee897412b4d48fda1.tar.bz2 |
resolved conflicts for merge of 222a835d to master
Change-Id: I82b1f9338eadaed07dc803e56682f4bbb2a97fc3
Diffstat (limited to 'CleanSpec.mk')
-rw-r--r-- | CleanSpec.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 3fa5463..f2f8e33 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -54,6 +54,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright $(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) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/android-info.txt) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST |