Commit Graph

77178 Commits

Author SHA1 Message Date
Yi-Yo Chiang
44fb3619d1 Android T GKI certification scheme
New scheme is to certify kernel & ramdisk image separately, and
effectively decouple kernel & user space ramdisk image.

Under the new scheme, the --os_version and --os_patch_level boot header
field must be empty in order to maintain consistency.
Instead, these values must be in the vbmeta hash descriptor and
GKI certificate.

The new scheme also validates the image metadata, including the security
patch level.

The 'generic_kernel' certificate is associated with the 'boot' partition
and 'generic_ramdisk' certificate with 'init_boot' partition.

The 'generic_ramdisk' certificate may be packed into the 'boot' image if
product configuration doesn't have 'init_boot' image, this is only for
testing purposes and would be removed eventually.

Bug: 210367929
Bug: 211741246
Bug: 203698939
Test: unpack_bootimg --boot_img boot.img
Test: unpack_bootimg --boot_img init_boot.img
Test: avbtool info_image --image out/boot_signature
Change-Id: Iaf48a6e3d4b97fa6bfb5e1635a288b045baa248f
2022-01-11 15:14:38 +08:00
Treehugger Robot
4250af6e75 Merge "Do not append .meta_lic to meta_lic" am: 9d83209f12 am: 0f12de8954 am: 9212d765d1
Original change: https://android-review.googlesource.com/c/platform/build/+/1944764

Change-Id: Iabdd828c0023f27d40cd3d954045952814bc1f1a
2022-01-11 07:01:50 +00:00
Yi-yo Chiang
27a309f627 Merge "Fix init_boot partition AVB signing" 2022-01-11 06:59:47 +00:00
Treehugger Robot
9212d765d1 Merge "Do not append .meta_lic to meta_lic" am: 9d83209f12 am: 0f12de8954
Original change: https://android-review.googlesource.com/c/platform/build/+/1944764

Change-Id: I6e619d6c4a563d3294cd0fb7431b9d5bbbb2f799
2022-01-11 06:43:24 +00:00
Treehugger Robot
0f12de8954 Merge "Do not append .meta_lic to meta_lic" am: 9d83209f12
Original change: https://android-review.googlesource.com/c/platform/build/+/1944764

Change-Id: I4d33690c7addc7cca8ff01772cab94a49d2d1e53
2022-01-11 06:29:04 +00:00
Treehugger Robot
9d83209f12 Merge "Do not append .meta_lic to meta_lic" 2022-01-11 06:11:14 +00:00
Bowgo Tsai
221628f342 Updates OWNERS file
gsi_keys.mk has been removed on commit
I3714de75b94be43a1364b89b92d893b336aa014b. Removing it from
the OWNERS file and adds developer_gsi_keys.mk.

Bug: 176869478
Test: presubmit
Change-Id: I2eeee65a244c4987f217f004ec47a0b6dca9b564
2022-01-11 11:13:25 +08:00
Bob Badour
63a281cc29 Do not append .meta_lic to meta_lic
Test: manual
Change-Id: I8d7162dc55f057d542faaa7feb546050d3a872e7
2022-01-10 18:00:03 -08:00
Treehugger Robot
e34de5e509 Merge "Embed host liblz4.so in target_files" am: 21e7285926 am: e3b9f4919e am: 8b1e80dae2 am: 3ff2003a5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1940645

Change-Id: I18c2687f036e57c74a9d2ec375072a016744b597
2022-01-10 23:52:17 +00:00
Pirama Arumuga Nainar
6a6b625e8e Merge "Set a BIONIC_COVERAGE .mk variable" am: bd7e1a38ba am: 8fdd8e7553 am: ad47bd9907 am: 909b666ec4
Original change: https://android-review.googlesource.com/c/platform/build/+/1918952

Change-Id: Ie9811a73fedf8d4a1d89505677336026dff20db1
2022-01-10 23:51:57 +00:00
Treehugger Robot
3ff2003a5f Merge "Embed host liblz4.so in target_files" am: 21e7285926 am: e3b9f4919e am: 8b1e80dae2
Original change: https://android-review.googlesource.com/c/platform/build/+/1940645

Change-Id: Iefef2963de8898f11d94611669e96a727c399262
2022-01-10 23:30:54 +00:00
Pirama Arumuga Nainar
909b666ec4 Merge "Set a BIONIC_COVERAGE .mk variable" am: bd7e1a38ba am: 8fdd8e7553 am: ad47bd9907
Original change: https://android-review.googlesource.com/c/platform/build/+/1918952

Change-Id: I9060c64719df35eaff3e4aa0ebe4d2e5280da3e2
2022-01-10 23:30:27 +00:00
Treehugger Robot
8b1e80dae2 Merge "Embed host liblz4.so in target_files" am: 21e7285926 am: e3b9f4919e
Original change: https://android-review.googlesource.com/c/platform/build/+/1940645

Change-Id: Iaf86bc2d3d7b8fe1225ddecec681d036f61af73f
2022-01-10 23:07:49 +00:00
Pirama Arumuga Nainar
ad47bd9907 Merge "Set a BIONIC_COVERAGE .mk variable" am: bd7e1a38ba am: 8fdd8e7553
Original change: https://android-review.googlesource.com/c/platform/build/+/1918952

Change-Id: I4735b3327aa5b66b19b1065506e0a83350f62f11
2022-01-10 23:07:31 +00:00
Treehugger Robot
e3b9f4919e Merge "Embed host liblz4.so in target_files" am: 21e7285926
Original change: https://android-review.googlesource.com/c/platform/build/+/1940645

Change-Id: I374aeeddd9741d6249e8c6786d3f30ea38d0ed30
2022-01-10 22:54:54 +00:00
Pirama Arumuga Nainar
8fdd8e7553 Merge "Set a BIONIC_COVERAGE .mk variable" am: bd7e1a38ba
Original change: https://android-review.googlesource.com/c/platform/build/+/1918952

Change-Id: I693064e34cb881687478d1106d9236299ba6f917
2022-01-10 22:54:34 +00:00
Treehugger Robot
21e7285926 Merge "Embed host liblz4.so in target_files" 2022-01-10 22:50:51 +00:00
Pirama Arumuga Nainar
bd7e1a38ba Merge "Set a BIONIC_COVERAGE .mk variable" 2022-01-10 22:36:57 +00:00
Victor Hsieh
9e12870560 Merge "Add min_sdk_version to BuildManifest.apk" am: 70ca7c6add am: 30afe79e30 am: 829fe6d623 am: 271ca249c3
Original change: https://android-review.googlesource.com/c/platform/build/+/1941946

Change-Id: I2c5281988a1bc9c14340d207c71275565eff866a
2022-01-10 21:17:34 +00:00
Victor Hsieh
271ca249c3 Merge "Add min_sdk_version to BuildManifest.apk" am: 70ca7c6add am: 30afe79e30 am: 829fe6d623
Original change: https://android-review.googlesource.com/c/platform/build/+/1941946

Change-Id: I451e6a91e49efdc64687753e195bffda1180d997
2022-01-10 20:57:07 +00:00
Victor Hsieh
829fe6d623 Merge "Add min_sdk_version to BuildManifest.apk" am: 70ca7c6add am: 30afe79e30
Original change: https://android-review.googlesource.com/c/platform/build/+/1941946

Change-Id: I2e90e96f229e3570d2d0b41da5f71951eef3550f
2022-01-10 20:39:13 +00:00
Victor Hsieh
30afe79e30 Merge "Add min_sdk_version to BuildManifest.apk" am: 70ca7c6add
Original change: https://android-review.googlesource.com/c/platform/build/+/1941946

Change-Id: I7013798ad7c29443eb7c93e6612b157179d78de2
2022-01-10 20:23:42 +00:00
Kelvin Zhang
6877e81467 Embed host liblz4.so in target_files
This file will be used by OTA generator to compress generated patches.
We need the host copy of LZ4 to ensure that compressed bytes matches
what the device would get if the compression were to be done on device.
For more details see go/lz4diff

Bug: 206729162
Test: m dist

Change-Id: I9c4ab772b001bf47da75cb87b028a1f27e2321a8
2022-01-10 12:12:21 -08:00
Victor Hsieh
70ca7c6add Merge "Add min_sdk_version to BuildManifest.apk" 2022-01-10 19:59:53 +00:00
Jiyong Park
efbb6ffa00 Add min_sdk_version to BuildManifest.apk
sign_target_files_apks demands it.

Bug: 213823227
Test: run com.google.android.tradefed.ota.SigningToolTest#Testcase1_Signingtest
Change-Id: I1bba2b25a71449a57d284024e77fb76d1b79a0ee
2022-01-10 20:14:05 +09:00
Jeff Vander Stoep
fe91d896ee Make com.android.sepolicy mandatory
Bug: 199914227
Test: aosp/1910032
Change-Id: I23599517b427363e758e6f06763079cc1482cb47
Merged-In: I23599517b427363e758e6f06763079cc1482cb47
2022-01-10 10:28:39 +00:00
Jeff Vander Stoep
2e272df576 Make com.android.sepolicy mandatory
Bug: 199914227
Test: aosp/1910032
Change-Id: I23599517b427363e758e6f06763079cc1482cb47
2022-01-10 11:25:41 +01:00
Treehugger Robot
91bdd8c77c Merge "Add sepolicy compat versions to soong config" am: 664dd48176 am: 96d7aa5d1c am: 6d3d669a7c am: 9bc0d8a3fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1940869

Change-Id: Ib7e1027cf321e398446c72931d612101f7a46740
2022-01-10 03:20:31 +00:00
Treehugger Robot
9bc0d8a3fe Merge "Add sepolicy compat versions to soong config" am: 664dd48176 am: 96d7aa5d1c am: 6d3d669a7c
Original change: https://android-review.googlesource.com/c/platform/build/+/1940869

Change-Id: I4344d069dc0549797766839cc9a9b70c9318e7fe
2022-01-10 03:03:24 +00:00
Treehugger Robot
6d3d669a7c Merge "Add sepolicy compat versions to soong config" am: 664dd48176 am: 96d7aa5d1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1940869

Change-Id: I649c2c69974fd2866c19833afc4f2d532165d106
2022-01-10 02:45:02 +00:00
Treehugger Robot
96d7aa5d1c Merge "Add sepolicy compat versions to soong config" am: 664dd48176
Original change: https://android-review.googlesource.com/c/platform/build/+/1940869

Change-Id: I377b420689133c0c56309f647af89ac59522f5d4
2022-01-10 02:30:03 +00:00
Treehugger Robot
664dd48176 Merge "Add sepolicy compat versions to soong config" 2022-01-10 02:09:22 +00:00
Treehugger Robot
e7edcdc66d Merge "Add option to enable zucchini" am: dcd7e283d2 am: 3468085607 am: cd9f83eeb8 am: 2f5176647a
Original change: https://android-review.googlesource.com/c/platform/build/+/1939053

Change-Id: I0e155c9433a51c78a4fd63de68581ab0135f08db
2022-01-09 21:46:07 +00:00
Treehugger Robot
2f5176647a Merge "Add option to enable zucchini" am: dcd7e283d2 am: 3468085607 am: cd9f83eeb8
Original change: https://android-review.googlesource.com/c/platform/build/+/1939053

Change-Id: Iacf90c3c455f31e6661c63095c4d3e605a1fe63c
2022-01-09 21:23:41 +00:00
Treehugger Robot
cd9f83eeb8 Merge "Add option to enable zucchini" am: dcd7e283d2 am: 3468085607
Original change: https://android-review.googlesource.com/c/platform/build/+/1939053

Change-Id: I2e28bf7f2c620a6be766b92a9e4b38d33658bedc
2022-01-09 21:11:12 +00:00
Treehugger Robot
3468085607 Merge "Add option to enable zucchini" am: dcd7e283d2
Original change: https://android-review.googlesource.com/c/platform/build/+/1939053

Change-Id: I1398da13f048093e8658baa5f3a16fc19a05a46d
2022-01-09 20:53:51 +00:00
Treehugger Robot
dcd7e283d2 Merge "Add option to enable zucchini" 2022-01-09 20:38:18 +00:00
Martin Stjernholm
6c0015b95e Merge "Add an option to specify the path to aapt2." am: 76537be0a9 am: 96cea0f44b am: a6e2ff4804 am: 948e8c78ab
Original change: https://android-review.googlesource.com/c/platform/build/+/1938648

Change-Id: Ie2c28d23ce90ac36cc2258192b6ea51cb7366511
2022-01-09 20:30:51 +00:00
Martin Stjernholm
948e8c78ab Merge "Add an option to specify the path to aapt2." am: 76537be0a9 am: 96cea0f44b am: a6e2ff4804
Original change: https://android-review.googlesource.com/c/platform/build/+/1938648

Change-Id: Id7ef7062bd58f44ee37686539c19a26916755dab
2022-01-09 20:14:19 +00:00
Martin Stjernholm
a6e2ff4804 Merge "Add an option to specify the path to aapt2." am: 76537be0a9 am: 96cea0f44b
Original change: https://android-review.googlesource.com/c/platform/build/+/1938648

Change-Id: I84e92b88bee8d474f2df015910795243298953be
2022-01-09 19:56:01 +00:00
Martin Stjernholm
96cea0f44b Merge "Add an option to specify the path to aapt2." am: 76537be0a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1938648

Change-Id: I8534ab25066bd863b3d64330da2d0a3aae835019
2022-01-09 19:35:19 +00:00
Martin Stjernholm
76537be0a9 Merge "Add an option to specify the path to aapt2." 2022-01-09 19:11:49 +00:00
Yi-Yo Chiang
33f973fd2a Fix init_boot partition AVB signing
Typo: 'BOARD_AVB_INIT_BOOT_IMAGE_KEY_PATH' ->
  'BOARD_AVB_INIT_BOOT_KEY_PATH'

Record avb_init_boot_* arguments to misc_info.txt

Add INIT_BOOT_SECURITY_PATCH to support per-partition SPL.

Bug: 203698939
Test: avbtool info_image --image init_boot.img
Change-Id: I63e082b1dd675138a6ab5cceb8814b3673d26b13
2022-01-09 16:28:25 +08:00
Bassem Khalife
389f21950c Update security string to 2022-03-01
Bug: 211820647

Change-Id: I9afb39715b0e470866a344246566e6414071ae6a
Merged-In: Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863
2022-01-09 01:08:35 +00:00
Treehugger Robot
aa9f3054a1 Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603 am: d75823a4bf am: 4d1a91b455
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I975fdc387f0eefd898dd0475521c9b43ffdc3e44
2022-01-08 19:17:50 +00:00
Treehugger Robot
4d1a91b455 Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603 am: d75823a4bf
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I32ef66c673653e2ed32bd824c6d59a181327a222
2022-01-08 19:06:33 +00:00
Treehugger Robot
d75823a4bf Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I4a164373f540863d6f7062347e9eb90261659202
2022-01-08 18:54:23 +00:00
Treehugger Robot
4f8d04b603 Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I38c3f73271a7b2daa9ab4fe877c5bf39933fd5f8
2022-01-08 18:37:28 +00:00
Treehugger Robot
6a95477b0f Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" 2022-01-08 18:20:12 +00:00
Yi-Yo Chiang
8193900f87 Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))
Else the branch condition would always evaluate to true, making the
other branch useless and wrong!

Bug: 211741246
Test: m dist
Change-Id: I4791712632cbe0d5a9e20962c8425dd20bbe0bfd
2022-01-08 15:59:02 +00:00