Merge "Revert "Correct some GSI settings to board makefile"" am: 0b733a2036 am: e869d4e158

am: 80a013a7e2

Change-Id: I30ffb6bc51f7e41c5a90472d078ba8f47384402e
This commit is contained in:
Michael Wright 2018-02-07 15:25:19 +00:00 committed by android-build-merger
commit 74e5ccb28b
2 changed files with 3 additions and 4 deletions

View file

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

View file

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