Commit graph

974 commits

Author SHA1 Message Date
Dan Willemsen
4a70a19f84 Reland "First pass at creating PRODUCT_HOST_PACKAGES"
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.

Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-04 18:03:14 -08:00
Yifan Hong
7a82913627 Merge "Build ODM manifests and fragments for each SKU." am: 5a4696e460 am: 9abd15f3c1
am: 934174f0bd

Change-Id: Ia088e5a7445e2701920307c65647def62589dd78
2019-03-01 11:00:14 -08:00
Yifan Hong
5a4696e460 Merge "Build ODM manifests and fragments for each SKU." 2019-03-01 18:32:32 +00:00
Lingfeng Yang
fbae04c480 Merge "Add more space in the sdk image for an updated swiftshader" am: aa39d0bdbc am: 60928d7ea8
am: cdca859619

Change-Id: I72dad71a4cb0264cfbddc1549cb8fcfad328e651
2019-02-26 08:34:50 -08:00
Cody Schuffelen
45dd92e51b Add more space in the sdk image for an updated swiftshader
Related change: aosp/907158.

Bug: 124530765
Test: TreeHugger
Change-Id: Id9313c3900dae90696101c83d04827d4ee5911bf
2019-02-26 00:21:17 -08:00
Dan Willemsen
086f8f002c Revert "First pass at creating PRODUCT_HOST_PACKAGES"
This reverts commit 7218a21ed0.

Reason for revert: broke some side branches, and the mac build

Change-Id: Ifa52f2dbf9a383f69e07ba0aceb4742b05376364
Fixes: 125912305
2019-02-22 22:02:23 +00:00
Dan Willemsen
7218a21ed0 First pass at creating PRODUCT_HOST_PACKAGES
This only defines PRODUCT_HOST_PACKAGES as a concept, and requires that
it contain at least all of the files that would be installed to the host
from PRODUCT_PACKAGES (minus libraries, as those are expected to be
installed based on what's required by other modules).

It does not actually change what will be built, that will happen in a
future change.

Test: build/soong/build_test.bash
Change-Id: Ie502b1a483f821b957cfd407c31a93e243896dae
2019-02-20 12:58:37 -08:00
Bowgo Tsai
cf82764987 Merge "GSI vbmeta.img: set rollback_index to zero" am: 93030e3f4d am: 8ef0dae2c6
am: 12d9c24978

Change-Id: Ic8e133ef3ff8743806086b0f06afb6ab64b6d0de
2019-02-19 17:54:52 -08:00
Yifan Hong
b321665b9d Build ODM manifests and fragments for each SKU.
In BoardConfig.mk, ODM manifests can be specify as follows:

    # installed to /odm/etc/vintf/manifest.xml
    ODM_MANIFEST_FILES := device/foo/bar/odm_manifest.xml

    # installed to /odm/etc/vintf/manifest_baz.xml
    ODM_MANIFEST_SKUS := baz
    ODM_MANIFEST_BAZ_FILES := device/foo/bar/odm_manifest_baz.xml

This is preferred over PRODUCT_COPY_FILES because it uses
assemble_vintf to check manifest at build time.

Test: builds

Change-Id: I18517b8ba09d3271627d6f21b8250b1bfc9e5db3
2019-02-19 12:37:50 -08:00
Bowgo Tsai
c1a8f1a5d7 GSI vbmeta.img: set rollback_index to zero
The major purpose of vbmeta.img built on GSI targets (e.g., aosp_arm,
aosp_arm64, etc) is to disable AVB. We should also set the rollback
index to zero, to prevent the device bootloader from updating the
last seen rollback index in the tamper-evident storage.

Bug: 122583908
Test: build aosp_arm64, then `avbtool info_image --image $OUT/vbmeta.img`
Change-Id: I48a49957f8dd3169003b9507fe80e519f301d5b5
2019-02-19 10:38:40 +08:00
Luca Stefani
461aaf9635 Merge "Fix flags argument passed to avbtool for GSI images" am: 6867fd7dda am: 15c83f9713
am: 428b90c473

Change-Id: I1ee5bff4e7d2fe48abab0b50eeb64932c75ea9be
2019-02-17 21:46:54 -08:00
Treehugger Robot
6867fd7dda Merge "Fix flags argument passed to avbtool for GSI images" 2019-02-18 05:27:52 +00:00
SzuWei Lin
6089834247 Merge "Fix booting problem on GSI with user build" am: b41ab14b1e am: 3e985e9b10
am: faffe14ea7

Change-Id: I34f18f0a5621429fae1abe110d5da2a19802c1fd
2019-02-15 02:54:26 -08:00
Treehugger Robot
b41ab14b1e Merge "Fix booting problem on GSI with user build" 2019-02-15 10:37:44 +00:00
SzuWei Lin
fd6d294c2b Fix booting problem on GSI with user build
GSI doesn't include gsi_system.prop on user build, and cause some
devices cannot boot GSI with user build. Some properies in
gsi_system.prop do not suitable for user build, the patch create
a new gsi_system_user.prop for GSI user build.

Bug: 124479721
Test: boot aosp_arm64-user on a blueline device.
Change-Id: Ide2bdc8e8733817afb832b50b28807768e22f011
2019-02-15 14:34:53 +08:00
Jiyong Park
45433aec35 Merge "TARGET_FLATTEN_APEX for GSI" am: 84f1ade63f am: cd3825adc7
am: 9772c4284a

Change-Id: I85f5b44b444a3050b85202eac5ae7bf7a29ca940
2019-02-12 00:23:16 -08:00
Jiyong Park
84f1ade63f Merge "TARGET_FLATTEN_APEX for GSI" 2019-02-12 08:04:39 +00:00
Jiyong Park
c35a33e59c TARGET_FLATTEN_APEX for GSI
Regular (non-flattened) APEX may require changes to the kernel, which is
against the Treble promise. For maximum compatibility, APEXes are
flattened for GSI so that APEXes can be activated by legacy kernels.

Bug: 124159875
Test: N/A
Change-Id: Iea5701d3b917ebf8657d3ce38131c1838b51677e
2019-02-11 21:50:02 +09:00
Anton Hansson
a16b161499 Merge "Enable suspend for mainline charger" am: c75e5ba356 am: faf0bbf2b8
am: 33f67f3c46

Change-Id: I4ef01514cc4a17f460d17fb2c379221f0d727c7d
2019-02-11 03:11:00 -08:00
Luca Stefani
7c7b4b6beb Fix flags argument passed to avbtool for GSI images
* avbtool expect extra flags to be passed with the --flags argument
  but currently we're missing an 's'.
  Luckily this isn't an issue as python argparse matches
  --flag as an alias to --flags ( python... )

Test: m vbmetaimage; check vbmeta header
Change-Id: I42d833c61c9b313dc067b1e519bae36395d09824
2019-02-10 19:59:27 +01:00
Anton Hansson
b100f5b834 Enable suspend for mainline charger
Bug: 80410283
Test: make
Change-Id: I09efa8dd557d586424c342772925b9ab2940bc88
2019-02-08 13:34:49 +00:00
Anton Hansson
ac03357fa7 Merge "Add bluetooth build config for mainline" am: 375291fa26 am: 6b50388c80
am: 9e78eb58ba

Change-Id: Iedda9dfda4513aff273be82e519bf570bc7fb30f
2019-02-07 00:23:57 -08:00
Anton Hansson
60bf75ae47 Add bluetooth build config for mainline
This matches the build config used on current mainline devices,
but should ideally be removed once possible.

Bug: 123695868
Test: boot blueline
Change-Id: I8fdef9fbe45b75f175afe9350974f54d1ec5e0c8
2019-02-06 15:51:03 +00:00
SzuWei Lin
0fae759a19 Merge changes I1772a55a,Ibd398d4f,If5476048,Ied201aad am: f834600fb3 am: c1ea73f62e
am: c93d4c67cd

Change-Id: If96022f3f2fc7a08558979d32513ce17c134078e
2019-02-01 16:52:30 -08:00
SzuWei Lin
ce1fdb2f55 Change aosp_$arch.mk to inherit from gsi_common.mk
The patch changes GSI (aosp_$arch) to inherit from gsi_common.mk
instead of aosp_base_telephony.mk.

The patch also clones the emulator_vendor.mk from emulator.mk to
include all vendor modules.

Bug: 119747870
Test: boot aosp_arm64-userdebug on a blueline device on master/P
Test: boot aosp_x86-userdebug on the emulator
Test: boot aosp_x86_64-userdebug on the emulator
Test: compare the out folder with/without the patch, only more content
Change-Id: Ibd398d4f93d2a964813e05ccd434975435d25adc
2019-02-01 11:29:02 +08:00
SzuWei Lin
b31043144e Merge "Add gsi_common.mk" am: 59fa4ca993 am: a4dabb3050
am: 782e918327

Change-Id: I90fabbbec4f10b3b9092f22df649cdaeb7caf956
2019-01-29 21:59:15 -08:00
SzuWei Lin
97951719ae Add gsi_common.mk
gsi_common.mk is a new makefile file for GSI build targets.
It inherited the content from Mainline by mainline_system.mk.
Also it include other default GSI settings and try to covered
all contents from aosp_base_telephony.mk

It will be used to replace the treble_common*.mk. All
aosp_$arch*.mk will become to inherit from gsi_common.mk.

This patch also contains a new build target gsi_arm64,
which is used to test the gsi_common.mk purely.

Bug: 119747870
Test: compare the out system folder between gsi_arm64 and aosp_arm64
Test: also the gsi_arm64-userdebuge can boot on a Pixel device
Change-Id: I9a013f9407e0fe06b45011e36d5169b94f67148d
2019-01-29 18:00:04 +08:00
Dan Willemsen
fee862995a Merge "Bump the remaining 32-bit arm configs to require neon" am: 1fdf5d789b am: 7ce2e247d9
am: f60131d3d8

Change-Id: If906225e372e1c278749ea0af8586dbdb4bdf77e
2019-01-24 20:14:23 -08:00
Dan Willemsen
53d62fed72 Bump the remaining 32-bit arm configs to require neon
Stop using armv7-a without neon for 32-bit unbundled apps, and update
generic_x86_arm to match the cuttlefish configuration that includes
neon.

Test: treehugger
Change-Id: Ieb6a2106655803a8ca609907c12168e628ee1b85
2019-01-23 22:27:33 -08:00
Anton Hansson
d596209561 Merge "Enable 64-bit mediadrmserver for mainline" am: 767569b489 am: 9c67ac4003
am: a9ea6d883c

Change-Id: I0d48bf4b3d529a425e30a7454a25f9adc8abaa38
2019-01-23 02:23:04 -08:00
Anton Hansson
767569b489 Merge "Enable 64-bit mediadrmserver for mainline" 2019-01-23 09:56:46 +00:00
Anton Hansson
f4e9102ea8 Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline" am: 9a0dd5b288 am: dae8049421
am: 8dad70660d

Change-Id: Ib9eae63af430c2751093cfc731145139b708e421
2019-01-16 09:09:38 -08:00
Anton Hansson
9791518d58 Set TARGET_COPY_OUT_ for product/vendor in mainline
This product variable is used to generate the loader config (to use
either /system/product or /product), and the vendor one is likely
used in similar ways. Having these partitions is required for mainline
devices, so set it in the shared BoardConfig.

Bug: 80410283
Test: make
Change-Id: I6f2d94ff43572a28df54ea8c60f2d838a3b9216c
2019-01-16 13:32:51 +00:00
Elliott Hughes
59de691ecf Merge "Use NEON for CTS/SDK/VTS builds too (64-bit edition)." am: 6621a2fa8b am: 2818d925f9
am: 5bd3719dc2

Change-Id: I1f6dd9008ce3b7eb7330bc84fe95d5e6573767b8
2019-01-10 13:47:28 -08:00
Elliott Hughes
eed7c8a458 Merge "Use NEON for CTS and SDK builds too." am: c64bc3229a am: 048939b1f0
am: c8a5ae36c0

Change-Id: I7cfbf110a81abf31aa816531b5ef0f6077ee84b4
2019-01-10 09:01:34 -08:00
Elliott Hughes
53a5581430 Use NEON for CTS/SDK/VTS builds too (64-bit edition).
It's 2019 and the CDD has required NEON for many years now.

I've left unbundled apps alone for now.

I think the recent fix here for https://issuetracker.google.com/116070933
was incorrect. (I've commented on the bug.)

Test: treehugger
Change-Id: Ia02305cfdff9fd18a85359bc44d8eb9cab1413bd
2019-01-10 08:59:47 -08:00
Elliott Hughes
c64bc3229a Merge "Use NEON for CTS and SDK builds too." 2019-01-10 16:39:41 +00:00
SzuWei Lin
e491887a29 Merge "Fix Legacy GSI settings for BoardConfigGsiCommon.mk" am: eeeb9f96c8 am: 3b9a7bca18
am: 27c2a4f8ab

Change-Id: I9ebce6a79e72f4ded2d337842671b47a361bd3a6
2019-01-09 19:35:19 -08:00
SzuWei Lin
a2d5ed1bed Fix Legacy GSI settings for BoardConfigGsiCommon.mk
Legacy GSI had been changed to include BoardConfigGsiCommon.mk
instead of treble_common*.mk. However, some default settings are
different than the original. This patch fixes
BOARD_BUILD_SYSTEM_ROOT_IMAGE in Legacy GSI makefiles.

The patch also removes redundant settings and fix some comments.

Bug: 122282239
Test: make
Change-Id: Ie4eb8cf410bfd2edc74648c0e5ee81028242a1b7
2019-01-10 10:26:03 +08:00
Elliott Hughes
27932bf3a8 Use NEON for CTS and SDK builds too.
It's 2019 and the CDD has required NEON for many years now.

I've left unbundled apps alone for now.

Test: treehugger
Change-Id: Iee22d4605a81e2840063a203b76db7df5b4f3c37
2019-01-09 20:15:30 +00:00
Anton Hansson
ac952ee4d7 Enable 64-bit mediadrmserver for mainline
This flag turns on 64-bit mediadrmserver for mainline. Keep the default
value for GSI for now.

Bug: 80410283
Test: make
Change-Id: Ie09b258f140b56121e4b531775b2a052b4dc6c15
2019-01-09 16:12:38 +00:00
SzuWei Lin
9d71661ea4 Merge "Refactor GSI BoardConfig.mk" am: 104904bdf0 am: eec9c48a6a
am: 8110b534f8

Change-Id: Ic1981c1cfeb172cd439b2b01be18fb3c0d532fc5
2019-01-08 22:29:14 -08:00
SzuWei Lin
c0104fb4ed Merge "Set 32bits Legacy GSI to be 32bits binder" am: ebe0590d0a am: ec8517adb4
am: be5abf1b2a

Change-Id: If883acde4919e3666b4afc0d3ab678710fa0c7d2
2019-01-08 01:58:22 -08:00
SzuWei Lin
1457b3fcbf Refactor GSI BoardConfig.mk
The patch modifies the Legacy GSI to use BoardConfigGsiCommon.mk
instead of board config treble-common*.mk, and delete these
treble-common*.mk files.

After the patch, the GSI common board configs are in single file
BoardConfigGsiCommon.mk

The patch also includes:

- Moving `TARGET_COPY_OUT_VENDOR := vendor` to
  BoardConfigGsiCommon.mk, because GSI always contains no vendor
  contents.
- Configure the binder interface bitness explicitly.
- Unify the structure of each BoardConfig.mk.

Bug: 122282239
Test: compare the out folder between with and without the patch
Test: output files are all the same
Change-Id: Ie5901446920dda317dea848e6d5a7bbcf10a32cf
2019-01-08 17:35:05 +08:00
SzuWei Lin
aee5affa6d Set 32bits Legacy GSI to be 32bits binder
The binder interface bitness is always 64bits from P.
To keep 32bits binder interface for Legacy GSI, we need to explict
configure it.

Bug: 122282239
Test: lunch aosp_arm_ab-userdebug; make -j
Change-Id: I90b45adb52c398d1c0cf3f877199f9dd1e0b3f86
2019-01-07 18:23:42 +08:00
Rajeev Kumar
53011f3c3a Enable statsd on Android Go devices running Android Q.
Bug: 120794303
Test: Manual test using following commands
adb shell getprop ro.statsd.enable
adb shell ps | grep statsd
adb shell cmd stats print-stats

Change-Id: I482544920069fa11ffeef686847923342e4d2a51
2018-12-19 19:30:13 +00:00
Anton Hansson
08ff4221e6 Merge "Reenable avb for mainline" am: 4a46570ff2 am: 0127f7dd4f
am: 5c50562aab

Change-Id: I8d33806ed913928f936f75d2ccc7cda99353ca97
2018-12-04 09:45:33 -08:00
Anton Hansson
de6f4cfdc8 Reenable avb for mainline
Partial rollback of Id5d114bde8b93800fe52c791ccc47cdffd86f382.

It is likely mainline also wants some of the BOARD_AVB_SYSTEM.. flags,
but I'm not entirely sure which ones.

Test: run build_mixed with this patch
Change-Id: I6ef3c01f6c74e6d93cf798b26b8c7a4785bbefb4
2018-12-04 16:56:33 +00:00
Anton Hansson
f49818173d Merge "Split GSI and mainline board configs" am: c0f0c2094d am: 42c220c79e
am: c144165c0b

Change-Id: I9b41873c56132c907bdb59bc01d1dd86cbd7dc3c
2018-12-03 08:07:28 -08:00
Anton Hansson
c0f0c2094d Merge "Split GSI and mainline board configs" 2018-12-03 11:16:30 +00:00