Commit graph

66211 commits

Author SHA1 Message Date
JaeMan Park
107ae739e0 Merge "Add java_sdk_library enforcement flags to product.mk" am: d06fe704b3
Original change: https://android-review.googlesource.com/c/platform/build/+/1512951

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I499fc54ee143e9c8aaf468be72abc79f7fca8a10
2020-12-15 00:36:02 +00:00
JaeMan Park
d06fe704b3 Merge "Add java_sdk_library enforcement flags to product.mk" 2020-12-15 00:00:05 +00:00
Diego Vela
5fa60fb418 Merge "Revert "Make ab_ota_partitions read only"" am: 111e9cbf40
Original change: https://android-review.googlesource.com/c/platform/build/+/1528745

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41073180f8ef20dbcae2df815c9fa0cf7db166fc
2020-12-14 23:30:05 +00: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
Treehugger Robot
7c18afcc00 Merge "Add stable aidl memtrack hal to vndk list" am: 886049dc15
Original change: https://android-review.googlesource.com/c/platform/build/+/1518924

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I606da3d99e806c15a112be8d2f0f7283d852bf09
2020-12-14 19:29:18 +00:00
Anton Hansson
605616d88b Merge "Make ab_ota_partitions read only" am: 3cc8ce9fd3
Original change: https://android-review.googlesource.com/c/platform/build/+/1528250

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I259e5a8e78ef3e34493df320bfe2c9d74cf38ccb
2020-12-14 19:26:18 +00: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
c7f432fd1e Merge "mark zipalign_test as unit tests" am: 31839fe1cd
Original change: https://android-review.googlesource.com/c/platform/build/+/1526393

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5470540a86fa4dc2044cb97c875d1940acc17c0
2020-12-14 16:27:09 +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
Treehugger Robot
cd7aa3bdca Merge "Revert^2 "Move keymint to android.hardware.security."" am: 2a9b7d7f9e
Original change: https://android-review.googlesource.com/c/platform/build/+/1525183

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e87c6ace111d7471a74d2c134880dace3e6d199
2020-12-12 00:26:10 +00:00
Treehugger Robot
06231a4302 Merge "Update OWNERS." am: f5019e064b
Original change: https://android-review.googlesource.com/c/platform/build/+/1526397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74791834af166620cbd435d046f1f5452b84c5f4
2020-12-12 00:25:22 +00: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
Tianjie Xu
5e1d91756b Merge "Use sha256 to build the hashtree in avb image" am: 7d958f4fd0
Original change: https://android-review.googlesource.com/c/platform/build/+/1518920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I599af27ae4f243bc78b1d2697281fd32096c6160
2020-12-11 21:13:17 +00:00
Yifan Hong
1b38e254df Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND." am: 999779bdce
Original change: https://android-review.googlesource.com/c/platform/build/+/1524321

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0f4c5100d33cdee360344f5066786092c1ef22c
2020-12-11 21:10:27 +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
46a5e283fb Merge "Revert "Move keymint to android.hardware.security."" am: 88256fd724
Original change: https://android-review.googlesource.com/c/platform/build/+/1525799

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id367e5957d1c09a21d982393b2a9cfdac76c8930
2020-12-11 12:51:16 +00: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
1c6d82a879 Merge "Update aosp_arm64 kernel 4.19 prebuilt name" am: c0d7c7204f
Original change: https://android-review.googlesource.com/c/platform/build/+/1524118

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fd5175e4b7494369869867111e92bde6205ed5f
2020-12-11 08:33:41 +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
aad1b4e472 Merge "Move keymint to android.hardware.security." am: 43943c65e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1518033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1503e74beb7de06930ae5ef29eece25f6a86342
2020-12-10 23:17:32 +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
5f71a978d0 Merge changes Ib2a4a208,Ic8235912 am: 63d3835f4a
Original change: https://android-review.googlesource.com/c/platform/build/+/1520781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibebc3b98d646ec6d256322c7d7a54b9bb77416f9
2020-12-10 12:36:53 +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
505f0db2a6 [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 2bbb6c9e30 -s ours
am skip reason: Change-Id I7b50510b61129704f71ab4d9c474d74f4739aef0 with SHA-1 863a120b51 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1521197

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c55466fc40c06aab98f2c953edcc4a4f13ee2b7
2020-12-10 03:05:23 +00: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
Jaegeuk Kim
74e57f6482 Merge "Enable system partition compression" 2020-12-10 00:41:04 +00:00
Lingfeng Yang
e44fd5916c Merge "emulator_arm64: Don't support AArch32" am: d5f89b11e6
Original change: https://android-review.googlesource.com/c/platform/build/+/1518218

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ad467e4dd38e55d978142fa8582194278d371e3
2020-12-09 18:34:38 +00:00
Lingfeng Yang
d5f89b11e6 Merge "emulator_arm64: Don't support AArch32" 2020-12-09 17:47:33 +00:00
Yifan Hong
e51c7e8aef Set allow list for generic ramdisk
Devices that uses generic ramdisk must inherit from generic_ramdisk.mk.
This makefile ensures that only a set of files can be installed to the
ramdisk. Other files must be installed to the vendor-ramdisk.

Let aosp_arm64 use this makefile.

Fixes: 173742069
Test: manual
Change-Id: Ib2a4a208deaf2f4d707bec256207b4b8479a601a
(cherry picked from commit bc9608c4c3f3cd0ac3f29863209c80fcfe4e2f7f)
2020-12-09 16:31:25 +00:00
Anton Hansson
d1258eb2f8 Add a "relaxed" mode for require-artifacts-in-path
This is useful when a makefile will produces different artifacts
depending on other configuration. Having an allow-list that's too strict
can make it a little  difficult to make progress.

Test: m nothing in follow-up
Change-Id: Ic8235912bcbaa8e249a752e042d4f42be4466e34
(cherry picked from commit 0b6fde311ac6bc2b64e69858382117a362645502)
2020-12-09 16:30:43 +00:00
Mohammad Islam
b2568c4731 Merge "Add a product flag that will enable compressed APEX on device" am: 0a246e5e31
Original change: https://android-review.googlesource.com/c/platform/build/+/1512289

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f1f01b0854b4e8209e82f0027a5ce419ecc50fd
2020-12-09 14:49:32 +00:00
Mohammad Islam
0a246e5e31 Merge "Add a product flag that will enable compressed APEX on device" 2020-12-09 14:34:42 +00:00
Anton Hansson
23f4dafb47 Merge "Move artifact path requirement logic to a separate file" am: 6e579c1347
Original change: https://android-review.googlesource.com/c/platform/build/+/1517924

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3593e2076a4fb89ca849a55e6af119856134fb19
2020-12-09 13:57:08 +00:00
Anton Hansson
6e579c1347 Merge "Move artifact path requirement logic to a separate file" 2020-12-09 13:12:36 +00:00
Anton Hansson
314a943bd3 Merge "Move rule for certificate_violation_modules.txt" am: 63722db3db
Original change: https://android-review.googlesource.com/c/platform/build/+/1517923

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If863889189d69fd26c327480c7d8943ec77afebb
2020-12-09 12:34:08 +00:00