Commit graph

940 commits

Author SHA1 Message Date
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
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
Anton Hansson
ba9016342f Merge "Remove USE_HWC2 plumbing and settings" am: bd5bad916a am: b9b80d4cab
am: dd4f2c5f45

Change-Id: Ic7d531a1b8fb539d9d7397e0db75fd816625d75d
2018-11-30 01:33:01 -08:00
Anton Hansson
40c4773288 Split GSI and mainline board configs
Make the mainline board config only import a subset of the GSI
options. The current set of attributes is the minimal set to
keep mainline_system_arm64 building, as well as not producing
any diffs in the current set of files in /system. It's possible
we'll need to move a few more over, but we'll do that on a
case-by-case basis.

Make the GSI config inherit the mainline one. The only diff for GSI
should be the addition of BOARD_USES_SYSTEM_OTHER_ODEX.

Bug: 119911662
Test: build mainline_system_arm64
Change-Id: Id5d114bde8b93800fe52c791ccc47cdffd86f382
2018-11-29 20:56:39 +00:00
Anton Hansson
b91e0c5ab1 Remove USE_HWC2 plumbing and settings
Last use removed in Ibefde5feaeaec8fb68cbc6ea1c019bf8b5e608bb

Test: make
Change-Id: I0567347379b1d030ed2f8dba7babc1f22be5dac4
2018-11-29 10:08:07 +00:00
Anton Hansson
cd60e6afa8 Merge "Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline" am: 6f2cfd93d8 am: 366dd21d79
am: db0671a079

Change-Id: Ibcb99f8e8b36cf0c14d133b3bdfc88fe2cad6dfa
2018-11-20 02:34:46 -08:00
Anton Hansson
adbafe0a7c Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline
Likely not the final setting we'll settle with for this device,
but brings mainline_system builds closer to the device builds
it's targeting.

Bug: 80410283
Test: build mainline_arm64
Change-Id: Ib672d1a060d0ad6a4e1faa210461bbbbaf6f2bc6
2018-11-16 16:36:50 +00:00
Anton Hansson
627f275460 Merge "Add a mainline arm64 device" am: 89fe71180b am: a93cb53236
am: 54cbd82865

Change-Id: Icb02b9316395a7c23e9e2354c351047eb1b7bd05
2018-10-29 12:34:19 -07:00
Anton Hansson
284b81c1ae Add a mainline arm64 device
The existing 'generic' targets are emulator devices, and targeting
it has the side-effect of including emulator-specific artifacts.

Create a mainline device instead, which is really generic. This also
allows specifying tweaks unsuitable for the emulator.

Include BoardConfigGsiCommon for now, even though it includes a few
things we likely won't want in the future.

Bug: 80410283
Bug: 111538404
Test: lunch mainline_arm64; m
Change-Id: I15e7cb41fcbd3c0592a091ba7a8575ddf10bda71
2018-10-29 16:15:04 +00:00
SzuWei Lin
8fa8d16c8f Merge "Workaround Legancy GSI for some Wifi firmware" am: 17c9e2a296 am: 55b07f5b00
am: 02ce7df100

Change-Id: I7bc220ddf5eef7396ea0989bb8397f8104663dbb
2018-10-19 15:43:14 -07:00
Treehugger Robot
17c9e2a296 Merge "Workaround Legancy GSI for some Wifi firmware" 2018-10-19 22:22:03 +00:00
SzuWei Lin
11892a4b9a Workaround Legancy GSI for some Wifi firmware
Bug: 117963911
Test: Turn on wifi with aosp_arm64_ab-userdebug on Pixel 1/2/3 devices
Change-Id: I0d516876522a687709ff21cbfc5bc0cc415b8335
2018-10-19 17:37:20 +08:00
bohu
ef14e322c2 Merge "fix generic_x86_arm"
am: 569ddd300b

Change-Id: I66338017c69b4ecfad9c630b1f9cbc6c45041d86
2018-10-18 00:27:28 -07:00
bohu
9b4e805a4d fix generic_x86_arm
To make the generic_x86_arm bootable.
Third party translabor binary can be added on the resulting
system.img and be tested at least on emulator.

BUG: 117673798

Change-Id: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
Merged-In: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
2018-10-17 21:57:15 +00:00
bohu
ec849266a1 fix generic_x86_arm
To make the generic_x86_arm bootable.
Third party translabor binary can be added on the resulting
system.img and be tested at least on emulator.

BUG: 117673798

Change-Id: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
2018-10-17 14:54:31 -07:00
Bowgo Tsai
94a6706eec Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug"" am: 3e795ee38b am: aba6c98fd2
am: 9b858192b7

Change-Id: I709ddec3f7f0dedd34c0992361010471002eb79c
2018-10-04 00:02:46 -07:00
Bowgo Tsai
aba6c98fd2 Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug""
am: 3e795ee38b

Change-Id: I1f97f0e1c36115e341397bbac76d684a083198d5
2018-10-03 23:52:22 -07:00
Treehugger Robot
3e795ee38b Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug"" 2018-10-04 06:37:38 +00:00
Bowgo Tsai
3ac95b53f4 Revert "Fix build error for sdk_gphone_x86_64-userdebug"
This reverts commit 6924b25729.

Reason for revert: with the following fix, this workaround is no longer needed.
  https://android-review.googlesource.com/c/platform/build/+/762663

Bug: 112322265
Change-Id: I07363f6a5aa1697b6f7702343f3120e1049f07d8
Test: build sdk_gphone_x86_64-userdebug
2018-10-04 04:35:55 +00:00
yidong.zhang
d0699b79bd Merge "Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build" am: 993513a7d0 am: 62a5929b56
am: d8249b4fa9

Change-Id: I7bb36022bc2c5c6cba6b65d083cd55f08bdd749e
2018-09-21 14:38:45 -07:00
yidong.zhang
62a5929b56 Merge "Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build"
am: 993513a7d0

Change-Id: Ic3b9480cd54942a13c8918a66ec22b45db78ed05
2018-09-20 22:55:27 -07:00
yidong.zhang
f190daa19b Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build
Vts release package is not compatible with cortext-a7(armv7-a) cores.
Build vts with TARGET_2ND_ARCH_VARIANT := armv7-a instead of armv8-a.

Bug: 116070933
Test: run vts -m VtsHalBaseV1_0TargetTest on cortext-a7 platform
Change-Id: I8089856223bac5129ad807496ad78b2cbfe1cc8a
2018-09-20 15:14:41 +00:00
Bowgo Tsai
3e8bbc1035 Merge "Fix build error for sdk_gphone_x86_64-userdebug" am: 8596dd8828 am: afb8caeadc
am: 2d48d064cd

Change-Id: Idba8d55873b43ac746e2bca2e79c118f1473b42f
2018-09-11 07:52:45 -07:00
Bowgo Tsai
afb8caeadc Merge "Fix build error for sdk_gphone_x86_64-userdebug"
am: 8596dd8828

Change-Id: Id209bcb1c4f24419980fdbb7dbef6c3c423ce788
2018-09-11 07:42:22 -07:00
Bowgo Tsai
6924b25729 Fix build error for sdk_gphone_x86_64-userdebug
Increases BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE to 128MB to fix
the build break. This is because we enabled AVB signing in the following
CL. And verified boot metadata will consume the reserved size in current
build system.

  https://android-review.googlesource.com/c/platform/build/+/745691

Bug: None
Test: build sdk_gphone_x86_64-userdebug
Change-Id: If1f44dccbc3a69b1b38a23e979f50c2c52401a25
2018-09-11 19:23:14 +08:00
Bowgo Tsai
038aa9038e Merge "Enable AVB signing on GSI" am: d9a58852bd am: 84452c6876
am: e51be704f6

Change-Id: I753227ffea20f252b52cdae608b7f2c21a368c2f
2018-09-10 23:46:38 -07:00
Bowgo Tsai
84452c6876 Merge "Enable AVB signing on GSI"
am: d9a58852bd

Change-Id: I16b4761de19f135265df4df5698f042ee8c47400
2018-09-10 23:37:17 -07:00
Bowgo Tsai
9d28638cfc Enable AVB signing on GSI
In current GSI builds, AVB signing is not allowed.
We should allow signing GSI image, while building a vbmeta.img with
AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (flag 2).

When need to disable AVB, use the vbmeta.img above together with the
GSI. When need enable AVB on GSI, include the GSI public key into the
device-specific vbmeta.img. Note that GSI is a chain partition so the
keys used to sign GSI and vbmeta.img are different.

Bug: 112293933
Test: build aosp_arm64-userdebug, checks flag 2 is set in vbmeta.img
      and there is AVB HASHTREE in system.img
      `avbtool info_image --image $OUT/system.img`
      `avbtool info_image --image $OUT/vbmeta.img`

Change-Id: If1eff317621882994e7dcbf37cd35f5bfa16b69a
2018-09-06 09:41:42 +08:00
Kevin Rocard
b4150586c5 Add emulator audio policy config in /vendor not /system
audio_policy_configuration_generic.xml is pushed in /system as the default
configuration (used if the vendor does not provide one in /vendor or /odm)
and for the emulator.

As a result it can be parsed by 2.0 and 4.0 audio HALs. The format
is retro-compatible, but not forward-compatible.

Additionally, the generic config pushed in /system should never be used
as the vendor should always provide a configuration file describing its
target architecture. Thus it should not be part of the GSI.

Those files were originally pushed in /system the emulator
target does not provide its own configuration file.
The emulator should provide config file instead in /vendor instead.

Bug: 78543061
Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio
Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \
          frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml
Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Merged-In: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit dad3ad6126)
2018-08-21 06:42:11 +00:00
Dan Willemsen
140839b15c Merge "Remove default BUILD_BROKEN_DUP_RULES := false" am: aa47189e1c am: 555904b0f3
am: a5d2c326f5

Change-Id: I395a80e5519a03a8fa77f8de54d5b2f6488dd1d1
2018-08-14 20:00:51 -07:00
Colin Cross
aaa5a14719 Merge "Remove TARGET_USES_MKE2FS" am: de684e84fb am: 232bc25b8a
am: 8ebb4ac573

Change-Id: I41bb6a7b580d609807277d85d9db93123653e636
2018-08-14 17:21:11 -07:00
Dan Willemsen
555904b0f3 Merge "Remove default BUILD_BROKEN_DUP_RULES := false"
am: aa47189e1c

Change-Id: Ib623fe24300b4310509f9b9d07aa26479226a8fe
2018-08-14 16:40:05 -07:00
Treehugger Robot
aa47189e1c Merge "Remove default BUILD_BROKEN_DUP_RULES := false" 2018-08-14 23:32:20 +00:00
Colin Cross
232bc25b8a Merge "Remove TARGET_USES_MKE2FS"
am: de684e84fb

Change-Id: If2f3d4fba3e782d12962b2d99b3d6b709ff85b70
2018-08-14 15:51:33 -07:00
Dan Willemsen
d1f319bc48 Remove default BUILD_BROKEN_DUP_RULES := false
This is now false by default.

Bug: 77611511
Test: build_test on git_master
Change-Id: I37ad52a3846c77da184725e7d6f4daae9f4b7f1c
2018-08-14 13:23:49 -07:00
Colin Cross
a110579e31 Remove TARGET_USES_MKE2FS
Nothing reads TARGET_USES_MKE2FS any more, mke2fs is always used.
Remove the requirement that TARGET_USES_MKE2FS is set, and remove
the places it is set.

Bug: 112241651
Test: m checkbuild
Change-Id: Ibdca062bbe7dcd19ba8f7ee7f8291ce746b74e65
2018-08-13 17:40:26 +00:00