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

* commit '06db73241a12a6b5f352647e966d254ae6443f68':
  Remove hardcoded TARGET_PREFER_32_BIT_APPS.
This commit is contained in:
Narayan Kamath 2014-05-27 11:23:39 +00:00 committed by Android Git Automerger
commit cc25436841
1 changed files with 3 additions and 0 deletions

View File

@ -249,6 +249,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# 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
# ************************************************