From 772c216e71b03ed1bc58ee825415eaeea5dd89dc Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 5 May 2014 15:25:41 -0700 Subject: build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config Set TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS, TARGET_PREFERS_32_BIT_APPS is enough to get apps to build for 32-bit only, and leaving TARGET_SUPPORTS_64_BIT_APPS unset confuses zygote64 because it finds an empty 64-bit ABI list. Change-Id: Iadea7f2b42c216710b54aeac6011a4e30e0f2eaa --- target/product/core_64_bit.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'target/product') diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk index 1947bf2..5d7abcb 100644 --- a/target/product/core_64_bit.mk +++ b/target/product/core_64_bit.mk @@ -35,6 +35,5 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32_64 # STOPSHIP: Revert this to allow products to select it themselves TARGET_PREFER_32_BIT_APPS := true -# Temporarily leave these unset to keep all apps with JNI building as 32-bit -# TARGET_SUPPORTS_32_BIT_APPS := true -# TARGET_SUPPORTS_64_BIT_APPS := true +TARGET_SUPPORTS_32_BIT_APPS := true +TARGET_SUPPORTS_64_BIT_APPS := true -- cgit v1.1