diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-17 11:11:35 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-06-17 11:11:35 +0100 |
| commit | 9d62dbc53278e1a380053178ead373619eca4a32 (patch) | |
| tree | 6eb94599964c939301747102856f1a020fbc8382 /CleanSpec.mk | |
| parent | b75b32830c2e99dae90ab1915e74c1b3ec592e39 (diff) | |
| parent | b60ccd667200d34808f253bdf8d56ea18834006b (diff) | |
| download | build-9d62dbc53278e1a380053178ead373619eca4a32.zip build-9d62dbc53278e1a380053178ead373619eca4a32.tar.gz build-9d62dbc53278e1a380053178ead373619eca4a32.tar.bz2 | |
resolved conflicts for merge of b60ccd66 to master
Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
Diffstat (limited to 'CleanSpec.mk')
| -rw-r--r-- | CleanSpec.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index ec0533d..6f436ce 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -273,6 +273,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) # ims-common.jar added to BOOTCLASSPATH $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/ETC/init.environ.rc_intermediates) +# Change ro.zygote for core_64_bit.mk from zygote32_64 to zygote64_32 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ |