diff options
| author | Colin Cross <ccross@android.com> | 2014-05-05 15:25:41 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-05-05 15:25:41 -0700 |
| commit | 772c216e71b03ed1bc58ee825415eaeea5dd89dc (patch) | |
| tree | df226c8ad5a71645167bd27f33e497b4d7afdb4b | |
| parent | 75b29ae0785ce571b71294554833c0a9f91a758b (diff) | |
| download | build-772c216e71b03ed1bc58ee825415eaeea5dd89dc.tar.gz | |
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
| -rw-r--r-- | target/product/core_64_bit.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk index 1947bf22de..5d7abcb752 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 |