Commit Graph

66195 Commits

Author SHA1 Message Date
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 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
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
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
Anton Hansson 63722db3db Merge "Move rule for certificate_violation_modules.txt" 2020-12-09 12:07:15 +00:00
Rupert Shuttleworth 8d22aadd1b Merge "Add missing buildinfo dependencies." am: 9204fde7cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1520200

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33af92b87ae8e8f32aa893d97b5dece0345c7afe
2020-12-09 08:21:06 +00:00
Rupert Shuttleworth 9204fde7cc Merge "Add missing buildinfo dependencies." 2020-12-09 07:46:51 +00:00
Treehugger Robot 749c16341a Merge changes I1deda85d,I43d7b2c6 am: 70c61bc6e9
Original change: https://android-review.googlesource.com/c/platform/build/+/1517621

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic68d1d052d9fba1933ff68ac340cff6e7defdae9
2020-12-09 07:07:04 +00:00
Treehugger Robot 70c61bc6e9 Merge changes I1deda85d,I43d7b2c6
* changes:
  calculation partition size use compressed image size
  add erofs to non partition spanning fs
2020-12-09 06:50:56 +00:00
Rupert Shuttleworth 3b37bc8986 Add missing buildinfo dependencies.
Test: Manually via USE_BAZEL=1 m dist (fixes a failure).
Change-Id: Ideb8dfd2e13932be5dcdef780888ffd602b15bd2
2020-12-09 04:24:15 +00:00
Treehugger Robot c45efb8c5c Merge "Ensure file permissions are writable before attempting to sign." am: 254051146c
Original change: https://android-review.googlesource.com/c/platform/build/+/1520199

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie21405f4eb1d519a457368d8155406258db452c2
2020-12-09 04:17:33 +00:00
Treehugger Robot 254051146c Merge "Ensure file permissions are writable before attempting to sign." 2020-12-09 03:55:15 +00:00
Christian Wailes 4af080d7d7 Merge "Added new compiler filter properties for dexopt." am: e42b9ceb81
Original change: https://android-review.googlesource.com/c/platform/build/+/1479801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4adf3e98b8ee18683339247537433239e33e2046
2020-12-09 01:22:52 +00:00
Christian Wailes e42b9ceb81 Merge "Added new compiler filter properties for dexopt." 2020-12-09 00:00:26 +00:00
Robin Hsu 3e51f4234c Enable system partition compression
* Prerequisites: external/f2fs-tools: sload compression support
* Must work with corresponding changes in system/extras repository
* If Board config does not change, it falls back to old behavior,
  i.e. no compression for the system partition
* Kernel f2fs compression support is a prerequisite if the Board config
  enables the compression (see below)
* Necessary board config change
 (e.g. device/<vendor>/<product>/BoardConfig-common.mk)

BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := f2fs
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 200000000
BOARD_SYSTEMIMAGE_FILE_SYSTEM_COMPRESS := true
BOARD_SYSTEMIMAGE_F2FS_SLOAD_COMPRESS_FLAGS := <sload compress sub-options>

Setting BOARD_SYSTEMIMAGE_FILE_SYSTEM_COMPRESS to true enables both the
compression support when the initial empty file system be made (mkfs.f2fs)
and the compression flag (-c) when the system image files be side-loaded
by sload.

Sload compress sub-options (i.e. options other than -c) will be provided
by BOARD_SYSTEMIMAGE_F2FS_SLOAD_COMPRESS_FLAGS.   If it is not given, or
is empty, the default sub-options will be used

Please refer to the sload.f2fs manual page.

Setting BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE to f2fs is trivially necessary.

* File system table (fstab), notably the file 'fstab.hardware', should
  also changed:
  - The file type must be changed to f2fs
  - Perhaps also other f2fs-specific options

Bug: 170918499
Test: Pixel4a userdebug build (from build id 6918751)
Signed-off-by: Robin Hsu <robinhsu@google.com>
Change-Id: Id9d67b5cb35dc806e06ff1320e89114abc996a28
2020-12-09 07:24:55 +08:00
Anton Hansson fae0f97114 Move artifact path requirement logic to a separate file
main.mk was a bit cluttered/difficult to follow wth all the indents. Put
the logic in a separate file instead.

Test: m nothing
Change-Id: I545bcd117a6bcd33b520ad279be1bab9b2d89393
2020-12-08 21:13:00 +00:00
Anton Hansson cd8fa36cbb Move rule for certificate_violation_modules.txt
It was in the middle of some other logic in main.mk

Put it in Makefile instead next to the other "information" dist txt
files.

Test: make and diff certificate_violation_modules.txt
Change-Id: I5b73a0f89ccf3de69e7608a0568d2b4b6f37e98c
2020-12-08 21:12:36 +00:00
Yifan Hong 6dbe939e08 Merge "Remove e2fsck from generic ramdisk." am: 748d568b29
Original change: https://android-review.googlesource.com/c/platform/build/+/1518222

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2eb169faa932d05c4ad79ed9e2304b5bb8157375
2020-12-08 19:18:27 +00:00
Yifan Hong 748d568b29 Merge "Remove e2fsck from generic ramdisk." 2020-12-08 18:43:28 +00:00