From 7b9347a7f9d870e149ef38438ad547abe2709ee2 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Tue, 6 May 2014 15:14:09 +0100 Subject: [PATCH] Remove hardcoded TARGET_PREFER_32_BIT_APPS. This isn't required any longer, besides individual products should be allowed to set this value themselves. Change-Id: I684edf073b5c19f412b4617f8aa22824193c19be --- CleanSpec.mk | 3 +++ target/product/core_64_bit.mk | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index e9af8b3a8..805226731 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -243,6 +243,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(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 # ************************************************ diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk index 5d7abcb75..971b6bdb4 100644 --- a/target/product/core_64_bit.mk +++ b/target/product/core_64_bit.mk @@ -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 -- 2.11.0