diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-28 16:02:45 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-28 16:02:45 -0700 |
| commit | ee26bf6a84ec697d9b4c1fe24c39c8238e2ec4df (patch) | |
| tree | c0cd7def516f8907a90fba354489d36fba120777 /CleanSpec.mk | |
| parent | cf68ba00d4b2388abc41396cc3d4d8864866bf0d (diff) | |
| parent | 7e127ebe0bf8753fcbeeac6140916d512322e308 (diff) | |
| download | build-ee26bf6a84ec697d9b4c1fe24c39c8238e2ec4df.zip build-ee26bf6a84ec697d9b4c1fe24c39c8238e2ec4df.tar.gz build-ee26bf6a84ec697d9b4c1fe24c39c8238e2ec4df.tar.bz2 | |
resolved conflicts for merge of 7e127ebe to master
Change-Id: I3f4eba3289c14da55d7d79ccf946b71dfc4062d1
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 e16c000..3ea1ff8 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -256,6 +256,9 @@ $(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)/root/default.prop) +# Rename persist.sys.dalvik.vm.lib.1 to allow new default +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ |