Commit Graph

29402 Commits

Author SHA1 Message Date
Nicolas Geoffray
53e651d4dd Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." am: 00a48b3df7 am: 3cb208e273 am: d43a0701d9 am: 22d159fd3c
Original change: https://android-review.googlesource.com/c/platform/build/+/1948581

Change-Id: Icb8cd7bf0191fb96765da535200570884591c18c
2022-01-17 13:30:15 +00:00
Nicolas Geoffray
22d159fd3c Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." am: 00a48b3df7 am: 3cb208e273 am: d43a0701d9
Original change: https://android-review.googlesource.com/c/platform/build/+/1948581

Change-Id: I107975440f1d9d9ae1ec8b57593cb7b7d2fdbeeb
2022-01-17 13:16:45 +00:00
Nicolas Geoffray
d43a0701d9 Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." am: 00a48b3df7 am: 3cb208e273
Original change: https://android-review.googlesource.com/c/platform/build/+/1948581

Change-Id: I1a545ff9b11e181c6ba7c0ccb9518aad547cf5f2
2022-01-17 13:00:53 +00:00
Nicolas Geoffray
00a48b3df7 Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." 2022-01-17 12:23:19 +00:00
Yi-yo Chiang
a7bba893e9 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" am: 4fe2a45dc7 am: 2f2c110829 am: c06825ad77 am: 78f5c8b0e1
Original change: https://android-review.googlesource.com/c/platform/build/+/1944700

Change-Id: I67c87eb3f171b1ecc803248a6728e368203e8059
2022-01-17 06:25:07 +00:00
Yi-yo Chiang
78f5c8b0e1 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" am: 4fe2a45dc7 am: 2f2c110829 am: c06825ad77
Original change: https://android-review.googlesource.com/c/platform/build/+/1944700

Change-Id: Ie689812cee0f3476aa2c3df988c70c5d5e241fb9
2022-01-17 06:11:19 +00:00
Yi-yo Chiang
c06825ad77 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" am: 4fe2a45dc7 am: 2f2c110829
Original change: https://android-review.googlesource.com/c/platform/build/+/1944700

Change-Id: Ib75aeec243d53c8bb49202249f6ec4e5a36600a9
2022-01-17 06:02:34 +00:00
Yi-yo Chiang
14d0e73497 Merge changes from topic "gki-avb-vts" am: 8b4e2fd6c0 am: b45caeb134 am: f2c62d7ddb am: e3874400a1
Original change: https://android-review.googlesource.com/c/platform/build/+/1941496

Change-Id: I252c986a2e0a15df168a14ac4d31f19f9f0dc19b
2022-01-17 05:51:06 +00:00
Yi-yo Chiang
e3874400a1 Merge changes from topic "gki-avb-vts" am: 8b4e2fd6c0 am: b45caeb134 am: f2c62d7ddb
Original change: https://android-review.googlesource.com/c/platform/build/+/1941496

Change-Id: Ibe6b331b3ae6637a0705e16c3afdcd9ff92e6f92
2022-01-17 05:38:40 +00:00
Yi-yo Chiang
4fe2a45dc7 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" 2022-01-17 05:29:40 +00:00
Yi-yo Chiang
f2c62d7ddb Merge changes from topic "gki-avb-vts" am: 8b4e2fd6c0 am: b45caeb134
Original change: https://android-review.googlesource.com/c/platform/build/+/1941496

Change-Id: I6a5cf765a64daceb3030e58c250108bb2e88395f
2022-01-17 05:21:53 +00:00
Yi-yo Chiang
8b4e2fd6c0 Merge changes from topic "gki-avb-vts"
* changes:
  releasetools: Android T GKI certification scheme
  Android T GKI certification scheme
2022-01-17 04:52:28 +00:00
Bassem Khalife
8c4f3da837 Update Security String to 2022-03-05 am: 16caffd2e7 am: aaf39a53f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579303

Change-Id: I6f2d1853df6bb1c98782c8285e25cc0e10132d9c
2022-01-15 16:49:25 +00:00
Bassem Khalife
aaf39a53f9 Update Security String to 2022-03-05 am: 16caffd2e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579303

Change-Id: If37e38c997ad736b84326bff4d83bc0bc5d4066e
2022-01-15 16:37:59 +00:00
Muhammad Haseeb Ahmad
6cbc06d649 Merge "Add PHONY target to make haiku-java target" am: d562eb5f1c am: 2e44587697 am: aaa71e0ee6 am: b84ac93aed
Original change: https://android-review.googlesource.com/c/platform/build/+/1948125

Change-Id: I65491f59e2c6976ebf30a63ad036a248c81521e1
2022-01-14 19:36:57 +00:00
Muhammad Haseeb Ahmad
b84ac93aed Merge "Add PHONY target to make haiku-java target" am: d562eb5f1c am: 2e44587697 am: aaa71e0ee6
Original change: https://android-review.googlesource.com/c/platform/build/+/1948125

Change-Id: Ie76e0acb599d64d528c14ad0af28c084bbaabfab
2022-01-14 19:19:33 +00:00
Muhammad Haseeb Ahmad
aaa71e0ee6 Merge "Add PHONY target to make haiku-java target" am: d562eb5f1c am: 2e44587697
Original change: https://android-review.googlesource.com/c/platform/build/+/1948125

Change-Id: Ia3d813687a650b431a4ca319959dde1aa646c297
2022-01-14 18:59:55 +00:00
Muhammad Haseeb Ahmad
d562eb5f1c Merge "Add PHONY target to make haiku-java target" 2022-01-14 18:13:12 +00:00
Nicolas Geoffray
50930076a2 Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing.
Keep the property for now to keep the ability to toggle on/off the
library we want. If we want to remove this functionality,
we need to cleanup all references to persist.sys.dalvik.vm.lib.2.

Test: build and boot with debug apex
Bug: 214049018
Change-Id: I66c7eb510f5a8b7974391ceafd309fba59a524a1
2022-01-14 16:07:07 +00:00
Treehugger Robot
a17e86ae0d Merge "Dump soong config variables in dump-variables-rbc" am: 9e81c44875 am: 636eac9642 am: ac95c8630a am: cf0e8f576b
Original change: https://android-review.googlesource.com/c/platform/build/+/1948233

Change-Id: I3688217dc17068dbd50bb104c83eb072f636eeca
2022-01-13 21:19:16 +00:00
Treehugger Robot
cf0e8f576b Merge "Dump soong config variables in dump-variables-rbc" am: 9e81c44875 am: 636eac9642 am: ac95c8630a
Original change: https://android-review.googlesource.com/c/platform/build/+/1948233

Change-Id: Ic16b24c49faf76fd4a9e35dc82bc4d9046c63a30
2022-01-13 21:04:31 +00:00
Treehugger Robot
ac95c8630a Merge "Dump soong config variables in dump-variables-rbc" am: 9e81c44875 am: 636eac9642
Original change: https://android-review.googlesource.com/c/platform/build/+/1948233

Change-Id: I45951e6492a09b4a9eb74d03535f36b1f65eefdc
2022-01-13 20:49:44 +00:00
Treehugger Robot
9e81c44875 Merge "Dump soong config variables in dump-variables-rbc" 2022-01-13 20:21:33 +00:00
Muhammad Haseeb Ahmad
cced136e8c Add PHONY target to make haiku-java target
This build creates artifacts for java fuzzers for Haiku.

Bug: 213225119
Test: build/soong/soong_ui.bash --make-mode -j86 haiku-java showcommands
dist DIST_DIR="."

Change-Id: I1ec16c39c3cd0ca008acc38bc51a3c3fa2ecdc9f
2022-01-13 19:53:40 +00:00
Cole Faust
c7226590e6 Dump soong config variables in dump-variables-rbc
There are some products whose board configurations
use soong_config_get to read the values of soong config
variables that were set in the product configuration.
These variables were being lost, as dump-variables-rbc
was skipping the soong config variables because mk2rbc
couldn't handle converting the raw SOONG_CONFIG_* variables.
To fix that issue, dump-variables-rbc now dumps them as
calls to soong_config_set instead.

Bug: 201700692
Test: m RBC_BOARD_CONFIG=1 nothing on certain products
Change-Id: I91ca8418635a94cf80362cad1729f48854f6bc98
2022-01-12 21:25:02 -08:00
Treehugger Robot
c697dd3c82 Merge "Generate .fsv_meta for more files" am: d36d4d8608 am: 0f84df6a5e am: bb37d74201 am: 5eb6ea9bf1
Original change: https://android-review.googlesource.com/c/platform/build/+/1941099

Change-Id: I8e03331dcc72045c63796b8a915a2cdb78cb56c5
2022-01-13 02:09:12 +00:00
Treehugger Robot
5eb6ea9bf1 Merge "Generate .fsv_meta for more files" am: d36d4d8608 am: 0f84df6a5e am: bb37d74201
Original change: https://android-review.googlesource.com/c/platform/build/+/1941099

Change-Id: I60f1f186c3230029a16245e747e924bbec9a62a4
2022-01-13 01:56:50 +00:00
Treehugger Robot
bb37d74201 Merge "Generate .fsv_meta for more files" am: d36d4d8608 am: 0f84df6a5e
Original change: https://android-review.googlesource.com/c/platform/build/+/1941099

Change-Id: I233936f781d48f775eca1208ce50f27aeacb2ac6
2022-01-13 01:39:17 +00:00
Treehugger Robot
d36d4d8608 Merge "Generate .fsv_meta for more files" 2022-01-13 01:06:01 +00:00
Treehugger Robot
f935c8b4c2 Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" am: 49c9d1867a am: 4a1fbf832d am: 3c2b365e23 am: a45477cc11
Original change: https://android-review.googlesource.com/c/platform/build/+/1941098

Change-Id: Iefdb3e7fb3bb7b5b10460bceb92b42bb140351b7
2022-01-12 22:09:16 +00:00
Treehugger Robot
a45477cc11 Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" am: 49c9d1867a am: 4a1fbf832d am: 3c2b365e23
Original change: https://android-review.googlesource.com/c/platform/build/+/1941098

Change-Id: Ibefbe52bd7c4d85ab89521f37acd8f0874061313
2022-01-12 21:56:01 +00:00
Treehugger Robot
3c2b365e23 Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" am: 49c9d1867a am: 4a1fbf832d
Original change: https://android-review.googlesource.com/c/platform/build/+/1941098

Change-Id: Id484f0cced953a4a94dc45f07963562e90025d8a
2022-01-12 21:35:59 +00:00
Treehugger Robot
49c9d1867a Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" 2022-01-12 20:55:38 +00:00
Treehugger Robot
e165f3e2df Merge "Remove win_sdk" am: d6bdfb3993 am: 9bc76efb0c am: ff5f9c27aa am: ecb58be871
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: Ica48f449f3fc29d9732c015bcb3ffa1d0f9cd0a1
2022-01-11 23:36:27 +00:00
Treehugger Robot
ecb58be871 Merge "Remove win_sdk" am: d6bdfb3993 am: 9bc76efb0c am: ff5f9c27aa
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: I1440b9ec6e658f50803113f082ddd651b22f80d1
2022-01-11 23:22:57 +00:00
Treehugger Robot
ff5f9c27aa Merge "Remove win_sdk" am: d6bdfb3993 am: 9bc76efb0c
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: Id7a09731d90cae8869ea29327887cd650a086b07
2022-01-11 23:07:48 +00:00
Treehugger Robot
d6bdfb3993 Merge "Remove win_sdk" 2022-01-11 22:25:02 +00:00
Cole Faust
fdc2cd300e Remove win_sdk
win_sdk is deprecated, if given on the command line
sdk will be build instead.

Bug: 212724080
Test: Presubmits
Change-Id: Ib3bd51923142b00100b49585ad88bc1292da2463
2022-01-11 10:31:11 -08:00
Yi-Yo Chiang
f282f5521d Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST
Right now if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST is given,
  $ m dist bootimage
would copy boot*.img to the dist dir.

After this change, both
  $ m dist  # droidcore
  $ m dist bootimage
would copy boot*.img to the dist dir, the difference is that the latter
builds & copies *only* the boot images.

Bug: 212486689
Test: m dist bootimage
Test: m dist => boot*.img are copied to dist dir
Change-Id: I1c714ce5d75eba93e32078b1ac291a181b05405a
2022-01-11 17:31:16 +08:00
Yi-yo Chiang
c23d3f78ad Merge "Fix init_boot partition AVB signing" am: 27a309f627 am: 85128a7fa0 am: d31e97cc6d am: 3d4a988016
Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I0f88b613396e0eef971b5c42f7aa5888b31fa9c1
2022-01-11 08:12:12 +00:00
Yi-yo Chiang
3d4a988016 Merge "Fix init_boot partition AVB signing" am: 27a309f627 am: 85128a7fa0 am: d31e97cc6d
Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I411a13d03f03f0271e434adaebf1157617cbf581
2022-01-11 07:49:54 +00:00
Yi-yo Chiang
d31e97cc6d Merge "Fix init_boot partition AVB signing" am: 27a309f627 am: 85128a7fa0
Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I4330eb68f30d31fa74c4e0f9bf980d1768776928
2022-01-11 07:37:07 +00:00
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
Yi-yo Chiang
27a309f627 Merge "Fix init_boot partition AVB signing" 2022-01-11 06:59:47 +00: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