commit 5128237ad3312523c5a1390efce33ad77f0f2ff0
author Colin Cross <ccross@android.com> Mon May 05 23:02:45 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 05 23:02:45 2014 +0000
tree 9ac95f92e27db6ecf1e71c49e80e46057f48b2d3
parent 2ff8919de339209412d9da2a524f566dfcf5847f
parent 772c216e71b03ed1bc58ee825415eaeea5dd89dc

Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"

target/product/core_64_bit.mk

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 @@
 # 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