From 87163300c25a1f4946298f6bc4bfce567bf1e3e2 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Wed, 7 Feb 2018 12:08:51 +0000 Subject: [PATCH] Revert "Correct some GSI settings to board makefile" This reverts commit 6e9648796810c4a2a05ac71c6cdc58167a144173. Reason for revert: build_test broken by this change. Change-Id: I0f48bb84dc8c521540c745814daa11c2900ac2c8 --- target/board/treble_common_64.mk | 4 ---- target/product/treble_common_64.mk | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/target/board/treble_common_64.mk b/target/board/treble_common_64.mk index f27208f4e0..0a6eb172d4 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 diff --git a/target/product/treble_common_64.mk b/target/product/treble_common_64.mk index e555b09c56..fc3c16f8c2 100644 --- a/target/product/treble_common_64.mk +++ b/target/product/treble_common_64.mk @@ -32,3 +32,6 @@ include build/make/target/product/treble_common.mk 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