Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f99bb3d authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 7b31bd3e: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS." 

* commit '7b31bd3e':
  Remove hardcoded TARGET_PREFER_32_BIT_APPS.
parents cdcb6926 7b31bd3e

CleanSpec.mk

+3 −0
Original line number Original line Diff line number Diff line
@@ -220,6 +220,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
# Adding dalvik.vm.dex2oat-flags to eng builds

# Adding dalvik.vm.dex2oat-flags to eng builds

$(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

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************
 
# ************************************************

target/product/core_64_bit.mk

+0 −6
Original line number Original line Diff line number Diff line
@@ -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

# This line must be parsed before the one in core_minimal.mk

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32_64

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_32_BIT_APPS := true

TARGET_SUPPORTS_64_BIT_APPS := true
 
TARGET_SUPPORTS_64_BIT_APPS := true