commit cc254368412969723cd348a8ee8d8e95a70372fa
author Narayan Kamath <narayan@google.com> Tue May 27 11:23:39 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 27 11:23:39 2014 +0000
tree 93fa737488f60a03d2737a2cb24f24582bc1a553
parent 8c980422e3bd12e97b1a68df52248af615fdb9e0
parent 06db73241a12a6b5f352647e966d254ae6443f68

am 06db7324: resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp

* commit '06db73241a12a6b5f352647e966d254ae6443f68':
  Remove hardcoded TARGET_PREFER_32_BIT_APPS.

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 46e652b..126d30b 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -249,6 +249,9 @@
 # Adding dalvik.vm.dex2oat-flags to eng builds
 $(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)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************