Commit Graph

4 Commits

Author SHA1 Message Date
Michael Wright 87163300c2 Revert "Correct some GSI settings to board makefile"
This reverts commit 6e96487968.

Reason for revert: build_test broken by this change.

Change-Id: I0f48bb84dc8c521540c745814daa11c2900ac2c8
2018-02-07 12:08:51 +00:00
SzuWei Lin 6e96487968 Correct some GSI settings to board makefile
TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS should
be board config variables. Move them to
target/board/treble_common_64.mk

Bug: 70951849
Test: lunch aosp_arm64_ab-userdebug; make -j
Change-Id: Ia3f6d5db1a7edc956597ab34c2feed088ecc6062
2018-01-30 17:23:47 +08:00
Bowgo Tsai cccd0b2a30 64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select
For 64-bit GSI, there are two different zygote settings:
  1. 64-bit primary, 32-bit secondary (init.zygote64_32.rc) OR
  2. 32-bit primary, 64-bit secondary (init.zygote32_64.rc)
  3. 64-bit only is currently forbidden (b/64280459#comment6)

This change adds the second setting into root dir for vendor.img to
select. The first setting already exists.

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 is removed
because the property will be put into vendor.img. i.e., it has no effect
on GSI.

Bug: 64280459
Test: build and boot device, checks init.zygote32_64.rc is in rootdir
Change-Id: I16b36018acac8cfeee7281d6f4b6c9c19467abec
2017-08-18 11:29:45 +08:00
SzuWei Lin 2999f29ea0 Move common 32/64 bits product settings to another files
Move the common 32/64 bits product settings from aosp_xxx.mk to

    target/product/treble_common_(32|64).mk

The original core_64_bit.mk is not match the GSI requirement,
and will be revised soon. So, clone the content of
core_64_bit.mk into treble_common_64.mk.

Bug: 64653300
Test: Build pass
Change-Id: I6154a5c4927287c703a874b5cbf6a7f0c2c3594c
2017-08-14 18:09:49 +08:00