diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-06 15:14:09 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-27 12:08:33 +0100 |
| commit | 214c53a0229ff86e3c7c55046ba1216e3d0ee844 (patch) | |
| tree | f6e163a818430449a5b9a9d4edddeb2448434f21 | |
| parent | 4e151105a02ba09acb277c6a084252d01c561a5f (diff) | |
| download | build-214c53a0229ff86e3c7c55046ba1216e3d0ee844.tar.gz | |
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
This isn't required any longer, besides individual products
should be allowed to set this value themselves.
(cherry picked from commit 7b9347a7f9d870e149ef38438ad547abe2709ee2)
Change-Id: If459eab32c6e7831596224ad3503baefbf028133
| -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 17fd5d6148..7108e10771 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk index 5d7abcb752..971b6bdb42 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 |