Commit Graph

66224 Commits

Author SHA1 Message Date
Martin Stjernholm d6e9ea97a6 Temporarily set default to keep building with ART sources.
Enables us to switch the default in .bp files, so ART prebuilt builds
can be tested with `m SOONG_CONFIG_art_module_source_build=false`.

Test: m
Test: m SOONG_CONFIG_art_module_source_build=false
Test: `m nothing` on some lunch targets that failed on internal
Bug: 172480615
Change-Id: I78725f77819dc29b47d2438dfe724532e4d2df47
2020-12-17 16:00:27 +00:00
Treehugger Robot 0de3a8b99f Merge "Move ro.zygote to vendor" 2020-12-17 07:02:25 +00:00
Treehugger Robot 98b7ac4602 Merge "Move jacocoagent installation to base_system" 2020-12-17 00:25:50 +00:00
Yifan Hong 42cae00cb0 Move jacocoagent installation to base_system
jacocoagent and its dependencies emits artifacts to system/,
hence it belongs to base_system.mk. It was rather incorrect
to add jacocoagent to EVERY product makefile because those
product makefiles may be enforcing artifact path requirements
(e.g. generic_ramdisk.mk).

Test: EMMA_INSTRUMENT=true m nothing
Bug: 175605139
Bug: 173742069
Change-Id: If9cb93ab8fd69d11e764ab830dc791bbe6106cf5
2020-12-16 09:50:42 -08:00
Treehugger Robot fb991de5fe Merge "generic_ramdisk.mk add missing slash." 2020-12-16 13:53:29 +00:00
Anton Hansson ed3b56ebca Merge "Make TARGET_ARCH optional in BoardConfig" 2020-12-16 11:48:04 +00:00
Anton Hansson e47d6e4a8c Merge "Add make support for Aml_abis and Ndk_abis options" 2020-12-16 11:38:49 +00:00
Anton Hansson 3ab1add1f2 Merge "Reformat _board_strip_readonly_list assigment" 2020-12-16 11:12:32 +00:00
Anton Hansson df38c92dd1 Merge "Add devices suitable for single-arch module builds" 2020-12-16 10:23:30 +00:00
Kalesh Singh 37638180d6 Merge "Revert "Add stable aidl memtrack hal to vndk list"" 2020-12-16 00:48:05 +00:00
Kalesh Singh 009936a198 Revert "Add stable aidl memtrack hal to vndk list"
Revert "Memtrack HAL stable aidl sepolicy"

Revert "Add android.hardware.memtrack-unstable-ndk_platform"

Revert submission 1518702-memtrack-aidl

Reason for revert: Broken tests and boot time regressions
Reverted Changes:
Ic4dd70e2c:Add android.hardware.memtrack-unstable-ndk_platfor...
Iaf99d0ca4:Add stable aidl memtrack HAL to product packages
Iac54ae2ba:Add stable aidl memtrack hal to vndk list
If310210a3:libmemtrack: Add support for AIDL memtrack HAL
Ib6c634def:Memtrack HAL: Add stable AIDL implementation
I5e1d0e006:Memtrack HAL stable aidl sepolicy

Change-Id: I922441bf3629a5d50672f1466a1f52fb9e2c3cb0
2020-12-16 00:19:38 +00:00
Yifan Hong e3a09008fb generic_ramdisk.mk add missing slash.
Test: pass
Bug: 173742069
Change-Id: Ie489858ff57cfc24b3cb28c61f85fffed1bbd4db
2020-12-15 13:53:19 -08:00
Anton Hansson 82996e4bbc Add devices suitable for single-arch module builds
Prior to this the generic_* devices were typically used for this
purpose. There are a few reasons to create new specific ones:
- the generic_arm64 device has a hack specifically for building
  multi-arch packages that we want to avoid
- the generic_* devices include a bunch of emulator config that does not
  make sense for unbundled builds

Bug: 172256440
Test: verify unbundled builds migrated from generic_* don't change
Change-Id: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
2020-12-15 18:59:40 +00:00
Anton Hansson 41f9cc2c6b Make TARGET_ARCH optional in BoardConfig
Not setting TARGET_ARCH is ok if TARGET_ARCH_SUITE is set instead. Skip
certain TARGET_ARCH-specific steps of the config:
- don't run the 'select' steps to figure out cpu flags
- don't generate dexopt config for TARGET_ARCH

Bug: 174315599
Test: lunch <product that sets TARGET_ARCH_SUITE but not TARGET_ARCH>
Change-Id: I74a9e71d0cc5c7f74d3b10b1c8bb89682c096d7c
2020-12-15 12:46:51 +00:00
Anton Hansson 5e05b8ef31 Add make support for Aml_abis and Ndk_abis options
Add a new TARGET_ARCH_SUITE which, when set to 'mainline_sdk' or 'ndk',
sets `Aml_abis: true` in soong.variables.

This is required to enable removing the custom soong.variables that
are being maintained for the ndk and mainline sdk builds.

Bug: 174315599
Test: TARGET_ARCH_SUITE=mainline-sdk m nothing; inspect soong.variables
      (ditto for ndk)
Change-Id: Ib651a637457310270840d721cdccf50bede3ee58
2020-12-15 12:46:46 +00:00
Anton Hansson b7b3d8ead6 Reformat _board_strip_readonly_list assigment
Allows for adding comments between variable definitions. This matches
the style in product.mk

Test: m nothing
Change-Id: Icc1e3d635a885000c49371997a55001739c02587
2020-12-15 12:45:37 +00:00
Treehugger Robot dec924e081 Merge "Revert^2 "Always turn on compatible property"" 2020-12-15 12:00:10 +00:00
Treehugger Robot fc9f1c0002 Merge "Pipe bazel() note text to stderr." 2020-12-15 05:06:26 +00:00
Treehugger Robot a25382e565 Merge "Allows GSI AVB keys on vendor boot even when not building vendor boot." 2020-12-15 02:48:43 +00:00
Treehugger Robot 78ee012509 Merge "Move goldfish RRO to vendor partition" 2020-12-15 01:53:03 +00:00
JaeMan Park c21cde1007 Merge "Add java_sdk_library enforcement flag verification" 2020-12-15 00:00:33 +00:00
JaeMan Park d06fe704b3 Merge "Add java_sdk_library enforcement flags to product.mk" 2020-12-15 00:00:05 +00:00
Jingwen Chen c8b5e196ce Pipe bazel() note text to stderr.
This allows subshell-ing bazel, e.g. bazel build $(bazel query //...)

Test: . build/envsetup.sh; bazel build $(bazel query <expression>)
Change-Id: If28b63769032b61e150422cb5b9b4e55c14cd13d
2020-12-14 18:51:50 -05:00
Diego Vela 111e9cbf40 Merge "Revert "Make ab_ota_partitions read only"" 2020-12-14 23:15:40 +00:00
Diego Vela f03fa0c5f2 Revert "Make ab_ota_partitions read only"
This reverts commit 929f1ad1d6.

Reason for revert: Caused a build break
Bug: 175633875

Change-Id: I6cb518a574c865a2e2c4ecdc4203dfa03bbf05d9
2020-12-14 23:08:31 +00:00
Daniel Norman 6af48c8312 Allows GSI AVB keys on vendor boot even when not building vendor boot.
This allows system-only builds (which disable vendor images) to inherit
from device makefiles that normally place GSI AVB keys on vendor boot.

Bug: 175594737
Test: lunch system-only build, m, observe warning not failure
Change-Id: Ib6c199d0a47b3b3be2143241d83ab586966cfd1e
2020-12-14 13:43:13 -08:00
Treehugger Robot 886049dc15 Merge "Add stable aidl memtrack hal to vndk list" 2020-12-14 18:36:10 +00:00
Anton Hansson 3cc8ce9fd3 Merge "Make ab_ota_partitions read only" 2020-12-14 18:25:22 +00:00
Julien Desprez 31839fe1cd Merge "mark zipalign_test as unit tests" 2020-12-14 16:11:41 +00:00
Tianjie 929f1ad1d6 Make ab_ota_partitions read only
Now that we have moved the AB_OTA_BOOTLOADER_PARTITIONS &
AB_OTA_RADIO_PARTITIONS to BoardConfig, we can make the
ab_ota_partitions read only.

Eventually, the variable will be exposed as a product build
property. And we want its value to stay unchanged during the
build process.

Bug: 162148770
Test: build coral
Merged-In: I37ab41cf2ed7bc9cb6db6b4700c03ab48ed31fff
Change-Id: Ied45347c3e56e56d1372d51b98d7e52b02ff4755
(cherry-picked from commit 6e93f484ac)
2020-12-14 15:47:51 +00:00
Yo Chiang 9cf722cf2c Move goldfish RRO to vendor partition
Change PRODUCT_PACKAGE_OVERLAYS to DEVICE_PACKAGE_OVERLAYS so that
goldfish RROs are not pulled into GSI.
This moves the goldfish configs to vendor partition, and since GSI
doesn't include a vendor, this means GSI won't include the goldfish
configs.

Bug: 174816040
Test: Presubmit
Change-Id: Ia3b4ca5fbf23278e55f1f200c9b96568d8d03606
2020-12-14 14:52:56 +08:00
Treehugger Robot 2a9b7d7f9e Merge "Revert^2 "Move keymint to android.hardware.security."" 2020-12-12 00:14:21 +00:00
Treehugger Robot f5019e064b Merge "Update OWNERS." 2020-12-11 23:49:48 +00:00
Elliott Hughes 27de935d83 Update OWNERS.
Test: treehugger
Change-Id: I5f9ddd03d5cd34fb398b842c933dc6a365be4b39
2020-12-11 12:56:27 -08:00
Tianjie Xu 7d958f4fd0 Merge "Use sha256 to build the hashtree in avb image" 2020-12-11 20:56:05 +00:00
Shawn Willden 49e1a2bb72 Revert^2 "Move keymint to android.hardware.security."
ea21979e96

Bug: 175345910
Bug: 171429297
Exempt-From-Owner-Approval: re-landing topic with no changes in this CL.
Change-Id: I1e49cee30493e4dd116bfbf0b2b78ec93191a7e5
2020-12-11 20:36:05 +00:00
Yifan Hong 999779bdce Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND." 2020-12-11 20:24:19 +00:00
Julien Desprez 74b8e09094 mark zipalign_test as unit tests
Test: make
Bug: 175408655
Change-Id: I03a7a0bb19ea408830acbf1ebe12ffb25012af91
2020-12-11 11:52:45 -08:00
Orion Hodson 88256fd724 Merge "Revert "Move keymint to android.hardware.security."" 2020-12-11 12:29:46 +00:00
Orion Hodson ea21979e96 Revert "Move keymint to android.hardware.security."
Revert "Move keymint to android.hardware.security."

Revert submission 1522123-move_keymint

Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.

Change-Id: I1d1b8e1131328dd27b3a1818298b1c019dac59aa
2020-12-11 10:45:43 +00:00
Will McVicker c0d7c7204f Merge "Update aosp_arm64 kernel 4.19 prebuilt name" 2020-12-11 07:52:19 +00:00
Tianjie 055128bf10 Use sha256 to build the hashtree in avb image
The hashtree is used in verified boot, and sha256 is more robust against
malicious attacks. Also, sha256 uses the same space as sha1 in the
hashtree. And there isn't much performance regression per
https://b.corp.google.com/issues/156162446#comment18

By putting the config in BoardConfigMainlineCommon.mk, we enable sha256
on all Pixels. And devices who want to use a different hash algorithm
can override it in it's own board configs.

Bug: 156162446
Test: boot the device and check performance
Change-Id: I9f1d3bcf241bc65adf10376cc5ae7ab1986216fa
2020-12-11 01:26:12 +00:00
Shawn Willden 43943c65e2 Merge "Move keymint to android.hardware.security." 2020-12-10 22:49:14 +00:00
Yifan Hong e086ae045e require-artifacts-in-path does not require PRODUCT_NAME/BRAND.
Also make generic_ramdisk.mk not to define them.

Test: m nothing
Change-Id: I5eff49abebe4194e3eba78557e5765e6ef2231e6
2020-12-10 13:18:29 -08:00
Will McVicker 55cd0ee523 Update aosp_arm64 kernel 4.19 prebuilt name
The aosp_arm64 kernel 4.19 prebuilt name is now kernel-4.19-gz instead
of Image.gz.

Bug: 172246735
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
Merged-In: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
2020-12-10 18:47:03 +00:00
Anton Hansson 63d3835f4a Merge changes Ib2a4a208,Ic8235912
* changes:
  Set allow list for generic ramdisk
  Add a "relaxed" mode for require-artifacts-in-path
2020-12-10 12:20:26 +00:00
Shawn Willden 85573ddd41 Move keymint to android.hardware.security.
Test: VtsAidlKeyMintTargetTest
Change-Id: I86bccf40e0f5351b573248b59846cea017204c4a
2020-12-09 20:55:53 -07:00
Xin Li 2bbb6c9e30 Merge "DO NOT MERGE - Merge Android R QPR1" 2020-12-10 02:18:30 +00:00
Xin Li ca9a71ef92 DO NOT MERGE - Merge Android R QPR1
Bug: 172690556
Merged-In: I7b50510b61129704f71ab4d9c474d74f4739aef0
Change-Id: Idf5f3681249744e3d8c78c8733244f684b163273
2020-12-09 17:44:01 -08:00
Jaegeuk Kim 863a120b51 Merge "Enable system partition compression" am: 74e57f6482
Original change: https://android-review.googlesource.com/c/platform/build/+/1520098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b50510b61129704f71ab4d9c474d74f4739aef0
2020-12-10 00:58:46 +00:00