diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-27 12:29:41 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-27 12:29:41 +0100 |
| commit | 7d55bea91fc7ae146ed35cd26683966aa0ef5bfb (patch) | |
| tree | ce654cb33ecc56e3bb3fa0dbb2f29ddd5e97908c /CleanSpec.mk | |
| parent | cc254368412969723cd348a8ee8d8e95a70372fa (diff) | |
| parent | 38c3c9309f12b2c9152bf69848f2f3aeb9832251 (diff) | |
| download | build-7d55bea91fc7ae146ed35cd26683966aa0ef5bfb.zip build-7d55bea91fc7ae146ed35cd26683966aa0ef5bfb.tar.gz build-7d55bea91fc7ae146ed35cd26683966aa0ef5bfb.tar.bz2 | |
resolved conflicts for merge of 38c3c930 to master
Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2
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 126d30b..e16c000 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -252,6 +252,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) # Unset TARGET_PREFER_32_BIT_APPS for 64 bit targets. $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +# Switching the x86 emulator over to a 64 bit primary zygote. +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ |