diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-06 15:14:09 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-08 08:03:02 +0000 |
| commit | 7b9347a7f9d870e149ef38438ad547abe2709ee2 (patch) | |
| tree | 9d5579229074dad8a9477641f5f9eadbf784774e | |
| parent | 2531f78c5a16f5ec77dc738aed4aa638d89e6e04 (diff) | |
| download | build-7b9347a7f9d870e149ef38438ad547abe2709ee2.zip build-7b9347a7f9d870e149ef38438ad547abe2709ee2.tar.gz build-7b9347a7f9d870e149ef38438ad547abe2709ee2.tar.bz2 | |
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
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | target/product/core_64_bit.mk | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index e9af8b3..8052267 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 5d7abcb..971b6bd 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 |