commit 0b733a2036f5f62115fe94ad73e1ea7e8cf4f2e2
author Michael Wright <michaelwr@google.com> Wed Feb 07 15:11:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 07 15:11:07 2018 +0000
tree 498c2387e0c4819da409802eaba07075efd327b5
parent 2f7f7ca1c01c45224ecca65471a497bf3d93122b
parent 87163300c25a1f4946298f6bc4bfce567bf1e3e2

Merge "Revert "Correct some GSI settings to board makefile""

target/board/treble_common_64.mk

diff --git a/target/board/treble_common_64.mk b/target/board/treble_common_64.mk
index f27208f..0a6eb17 100644
--- a/target/board/treble_common_64.mk
+++ b/target/board/treble_common_64.mk
@@ -16,10 +16,6 @@
 
 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 e555b09..fc3c16f 100644
--- a/target/product/treble_common_64.mk
+++ b/target/product/treble_common_64.mk
@@ -32,3 +32,6 @@
 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