commit 2646ca50e5d57e39dc85481d4af028d9134773a4
author SzuWei Lin <szuweilin@google.com> Wed Feb 07 09:14:43 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 07 09:14:43 2018 +0000
tree c7e5f39c621a3cf26ed7d6022fcc61fae25b3c55
parent d226e81d9b056b633e78e7e41c8b88160058d0a6
parent 0c6f675b627cb33cfaacc8df1249863ac8e1bf4c

Merge "Correct some GSI settings to board makefile" am: 2f7f7ca1c0
am: 0c6f675b62

Change-Id: I32de3a5d39b9759bb3dcdde930a314c2e7833cb0

target/board/treble_common_64.mk

diff --git a/target/board/treble_common_64.mk b/target/board/treble_common_64.mk
index 0a6eb17..f27208f 100644
--- a/target/board/treble_common_64.mk
+++ b/target/board/treble_common_64.mk
@@ -16,6 +16,10 @@
 
 include build/make/target/board/treble_common.mk
 
+# Enable both 32 and 64 bits APP support
+TARGET_SUPPORTS_32_BIT_APPS := true
+TARGET_SUPPORTS_64_BIT_APPS := true
+
 # Enable 64-bits binder
 TARGET_USES_64_BIT_BINDER := true
 

target/product/treble_common_64.mk

diff --git a/target/product/treble_common_64.mk b/target/product/treble_common_64.mk
index fc3c16f..e555b09 100644
--- a/target/product/treble_common_64.mk
+++ b/target/product/treble_common_64.mk
@@ -32,6 +32,3 @@
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc \
     system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc
-
-TARGET_SUPPORTS_32_BIT_APPS := true
-TARGET_SUPPORTS_64_BIT_APPS := true