commit 40aabbeeac53a01d42316423c7091612a1302b3f
author Colin Cross <ccross@android.com> Mon May 05 23:09:04 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon May 05 23:09:04 2014 +0000
tree 7c0359b071184d75434c473e50f2f50f2aed3eef
parent 6f9166640a62f694a257a307284ea1c442f66a7b
parent 9150a90dafd6554519d41e5efffeb501268cf8de

am 9150a90d: am 5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"

* commit '9150a90dafd6554519d41e5efffeb501268cf8de':
  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