Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."

This commit is contained in:
Narayan Kamath 2014-05-27 11:12:33 +00:00 committed by Gerrit Code Review
commit 7b31bd3e8f
2 changed files with 3 additions and 6 deletions

View File

@ -220,6 +220,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
# ************************************************

View File

@ -29,11 +29,5 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32_64.rc:root/init.zygote32
# This line must be parsed before the one in core_minimal.mk
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32_64
# Temporary hack to prefer launching processes as 32 bit
# instead of 64 bit.
#
# STOPSHIP: Revert this to allow products to select it themselves
TARGET_PREFER_32_BIT_APPS := true
TARGET_SUPPORTS_32_BIT_APPS := true
TARGET_SUPPORTS_64_BIT_APPS := true