Commit Graph

76439 Commits

Author SHA1 Message Date
Cole Faust
4db91af70c Create $(findstring) starlark implementation
Bug: 201700692
Test: go test in other cl in the topic
Change-Id: Ibe7d600c9fe5335a1277e1572aa52f6c512c2951
2021-12-13 16:35:54 -08:00
Rafay Kamran
4b08c049dc Merge "Created supplemental_process certificate and private key" 2021-12-13 14:19:07 +00:00
Inseob Kim
1156232eaa Merge "Refactor sepolicy version related codes" am: e23891877c am: c95816ce4b am: 7a259e3752 am: 7bc4dacabd
Original change: https://android-review.googlesource.com/c/platform/build/+/1916858

Change-Id: I4f3c548b21a8d5afe88db33897c7666c1ffacbea
2021-12-13 05:03:21 +00:00
Inseob Kim
7bc4dacabd Merge "Refactor sepolicy version related codes" am: e23891877c am: c95816ce4b am: 7a259e3752
Original change: https://android-review.googlesource.com/c/platform/build/+/1916858

Change-Id: Id55341d883bf9bcf4aabf2ed44f6892ca9da8c27
2021-12-13 04:45:51 +00:00
Inseob Kim
7a259e3752 Merge "Refactor sepolicy version related codes" am: e23891877c am: c95816ce4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1916858

Change-Id: I8929bbc5892ab99ceede3ce262fbd67072e9bbe9
2021-12-13 04:30:19 +00:00
Inseob Kim
c95816ce4b Merge "Refactor sepolicy version related codes" am: e23891877c
Original change: https://android-review.googlesource.com/c/platform/build/+/1916858

Change-Id: Ib836574268ae722da7a06d53d2014daa5877a991
2021-12-13 04:13:32 +00:00
Inseob Kim
e23891877c Merge "Refactor sepolicy version related codes" 2021-12-13 03:57:36 +00:00
Ben Fennema
6082d0aeb5 Add --avb_recovery_* options to replace recovery avb key
Test: run sign_target_files_apks with --avb_recovery_key to specify a different key and check with avbtool the key was replaced
Bug: 210126985
Signed-off-by: Ben Fennema <fennema@google.com>
Change-Id: Ic2bb3f6855a49ec065a4c778c429ff076902b95c
2021-12-11 14:05:06 -08:00
Treehugger Robot
cf4526b49d Merge "Revert^2 "Reuse license metadata files from Soong"" am: f13d0b2f22 am: 49da1ac76c am: d3ab9dfb51 am: 52fea5cdc0
Original change: https://android-review.googlesource.com/c/platform/build/+/1918950

Change-Id: I01d597d6841564d8bf02768b4f47f1190c6f6bb8
2021-12-11 04:51:58 +00:00
Treehugger Robot
52fea5cdc0 Merge "Revert^2 "Reuse license metadata files from Soong"" am: f13d0b2f22 am: 49da1ac76c am: d3ab9dfb51
Original change: https://android-review.googlesource.com/c/platform/build/+/1918950

Change-Id: I9a1e565a1757de8a5964e101471a3effe0300ef2
2021-12-11 04:32:39 +00:00
Treehugger Robot
d3ab9dfb51 Merge "Revert^2 "Reuse license metadata files from Soong"" am: f13d0b2f22 am: 49da1ac76c
Original change: https://android-review.googlesource.com/c/platform/build/+/1918950

Change-Id: Icade616ffd3ca4301e69425fbfc642742fd53d67
2021-12-11 04:04:21 +00:00
Treehugger Robot
49da1ac76c Merge "Revert^2 "Reuse license metadata files from Soong"" am: f13d0b2f22
Original change: https://android-review.googlesource.com/c/platform/build/+/1918950

Change-Id: I5b572989961bf849cedd2da802b72361ef5fd778
2021-12-11 03:48:24 +00:00
Treehugger Robot
f13d0b2f22 Merge "Revert^2 "Reuse license metadata files from Soong"" 2021-12-11 03:32:18 +00:00
Colin Cross
cfa8a0e021 Merge "Revert "Reuse license metadata files from Soong"" am: 91a9483e87 am: 2e075808dd am: 4ab1019a66 am: eac023a522
Original change: https://android-review.googlesource.com/c/platform/build/+/1918946

Change-Id: I778d2742939ebab82b521630ef2457d2eb72aff9
2021-12-11 00:28:39 +00:00
Colin Cross
eac023a522 Merge "Revert "Reuse license metadata files from Soong"" am: 91a9483e87 am: 2e075808dd am: 4ab1019a66
Original change: https://android-review.googlesource.com/c/platform/build/+/1918946

Change-Id: Ia321ccdbd7376dbd6f6515de192aaea4049d1743
2021-12-10 23:54:50 +00:00
Colin Cross
4ab1019a66 Merge "Revert "Reuse license metadata files from Soong"" am: 91a9483e87 am: 2e075808dd
Original change: https://android-review.googlesource.com/c/platform/build/+/1918946

Change-Id: Ifa1a9114379e9a0b47cfff75d7058dabce61ccab
2021-12-10 23:39:20 +00:00
Colin Cross
2e075808dd Merge "Revert "Reuse license metadata files from Soong"" am: 91a9483e87
Original change: https://android-review.googlesource.com/c/platform/build/+/1918946

Change-Id: I85bbf851be4f5d2d3884f2c4652e32b0bcbd59b3
2021-12-10 23:20:49 +00:00
Colin Cross
71d9919322 Revert^2 "Reuse license metadata files from Soong"
81b167693f

Change-Id: Iff45cffb1f2b9d01cec70d96e34f46d35bb37842
2021-12-10 23:05:02 +00:00
Colin Cross
91a9483e87 Merge "Revert "Reuse license metadata files from Soong"" 2021-12-10 23:04:45 +00:00
Colin Cross
81b167693f Revert "Reuse license metadata files from Soong"
Revert "Escape Host*Variable contents"

Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: Id9d66c01453aebe8a52eaa6628e9933a990d4c2f
2021-12-10 23:03:08 +00:00
Cole Faust
cdadc953ae Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b am: 98a7011088 am: 03c397942c am: 16bc902d32
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: I2558431e26c26cfcdcd63314e238420b57916e03
2021-12-10 23:02:39 +00:00
Colin Cross
eedeaeb7d3 Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc am: b48261121e am: 8d6a7102ac am: 870134db7c
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

Change-Id: Id82e90813b23ca6ab82239d91e73240bee11dec5
2021-12-10 23:01:53 +00:00
Cole Faust
16bc902d32 Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b am: 98a7011088 am: 03c397942c
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: Idef267ecf33627ccd673a8d1205bd13c0b0ba6a3
2021-12-10 22:42:37 +00:00
Colin Cross
870134db7c Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc am: b48261121e am: 8d6a7102ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

Change-Id: Ib5485d9092d2b3d4480dfcdb3a4bd2d1d15cc71e
2021-12-10 22:42:17 +00:00
Cole Faust
03c397942c Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b am: 98a7011088
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: I65234df27f423f1370f62f43d91401744afbced1
2021-12-10 22:25:36 +00:00
Colin Cross
8d6a7102ac Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc am: b48261121e
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

Change-Id: I2425845206145cc4f3115017607299fb77354dfc
2021-12-10 22:20:35 +00:00
Cole Faust
98a7011088 Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: I37ee8f0df0bcb212e0fc3add6b069e5857614747
2021-12-10 22:05:31 +00:00
Colin Cross
b48261121e Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

Change-Id: Id5db06a34777ff0a2bca39ffa0e083ca2a131a3d
2021-12-10 22:04:39 +00:00
Cole Faust
01e022369b Merge "Strip ODM_MANIFEST_SKUS" 2021-12-10 22:02:22 +00:00
Colin Cross
6cf8ec77cc Merge "Reuse license metadata files from Soong" 2021-12-10 21:43:49 +00:00
Akilesh Kailash
e4173f3167 Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d am: 7260b087ea am: 1b14617cdb am: 3791ff3cf6
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I349cc833f3517aeac9ccba2db1c236dbff30dc86
2021-12-10 20:51:05 +00:00
Akilesh Kailash
3791ff3cf6 Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d am: 7260b087ea am: 1b14617cdb
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I96e2ec314768bf9899bd3ea83e9bcbed0ccdc648
2021-12-10 20:32:55 +00:00
Akilesh Kailash
1b14617cdb Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d am: 7260b087ea
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I9fe57a883f46b38c1fb891777e8d2a06c33466dc
2021-12-10 20:15:43 +00:00
Akilesh Kailash
7260b087ea Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I55d5d4da987da73432f31f68c135903f725fd6fd
2021-12-10 19:58:12 +00:00
Akilesh Kailash
3f5f0b306d Merge "Enable userspace snapshots for OTA" 2021-12-10 19:44:48 +00:00
Nicolas Geoffray
feac8e2791 [automerger skipped] Merge "Use prebuilts of the ART Module by default in SC branches." into sc-v2-dev am: df8b9c17b0 -s ours am: d0c5e5d506 -s ours
am skip reason: Merged-In I50187408a01e0c6f5ecea12fe3a423e1c5d93612 with SHA-1 607138be38 is already in history

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

Change-Id: I75d0fdcae89b7e576b91126019f64a05efcc2bf6
2021-12-10 19:34:29 +00:00
Nicolas Geoffray
d0c5e5d506 [automerger skipped] Merge "Use prebuilts of the ART Module by default in SC branches." into sc-v2-dev am: df8b9c17b0 -s ours
am skip reason: Merged-In I50187408a01e0c6f5ecea12fe3a423e1c5d93612 with SHA-1 607138be38 is already in history

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

Change-Id: I37e0cfda30e9e2752dfadcb87cb78640f623b319
2021-12-10 19:20:52 +00:00
Nicolas Geoffray
df8b9c17b0 Merge "Use prebuilts of the ART Module by default in SC branches." into sc-v2-dev 2021-12-10 18:59:39 +00:00
Janis Danisevskis
f0335310f7 Update vndk list with dice hal libraries.
Bug: 198197213
Test: N/A
Change-Id: Ib199c5c18438b0d62ec5d6619ce9708c71ecac22
2021-12-10 09:35:16 -08:00
Inseob Kim
b4cb3e0bb0 Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531 am: 7c708e2d27 am: 4d9cf5c4e7 am: 2f2b777d1b
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: I5ceeed7675529da528d87c86b8361d8e3a29a6ab
2021-12-10 13:20:34 +00:00
Inseob Kim
2f2b777d1b Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531 am: 7c708e2d27 am: 4d9cf5c4e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: I0644150683b13d8165704daead1380000906fb7c
2021-12-10 13:03:08 +00:00
Inseob Kim
4d9cf5c4e7 Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531 am: 7c708e2d27
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: Ifab9c475dd11183a6465ca48d911f5b86ecaee74
2021-12-10 12:50:56 +00:00
Inseob Kim
7c708e2d27 Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: I15f4771b72598028a380d15ca8f1c3421b07890d
2021-12-10 12:29:48 +00:00
Inseob Kim
f09eddd531 Merge "Add BoardPlatVendorPolicy to soong config" 2021-12-10 12:13:36 +00:00
Inseob Kim
51c455bdb2 Refactor sepolicy version related codes
1. Move BOARD_SEPOLICY_VERS to build/make/core/config.mk where
PLATFORM_SEPOLICY_VERSION is set.

2. Remove hard-coded versions for the treble tests.

Test: build
Change-Id: Iab338a1f16855205d62312d4247a15ea766be1fe
2021-12-10 18:36:18 +09:00
Yi-yo Chiang
1df62889e5 [automerger skipped] Merge changes from topic "no-more-boot-debug-gki-sc-v2-dev" into sc-v2-dev am: 806d08f61d -s ours am: a728942d27 -s ours
am skip reason: Merged-In I3161e42b00a93177a1a4cb3b22da2218d294b7a7 with SHA-1 92f08702dd is already in history

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

Change-Id: I085102f263e7847ffd595e308b2863b9aa46da13
2021-12-10 06:11:07 +00:00
Yi-yo Chiang
a728942d27 [automerger skipped] Merge changes from topic "no-more-boot-debug-gki-sc-v2-dev" into sc-v2-dev am: 806d08f61d -s ours
am skip reason: Merged-In I3161e42b00a93177a1a4cb3b22da2218d294b7a7 with SHA-1 92f08702dd is already in history

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

Change-Id: I94ede33c661da70bb001f27c2df0659956d6b4a2
2021-12-10 05:57:00 +00:00
Yi-yo Chiang
806d08f61d Merge changes from topic "no-more-boot-debug-gki-sc-v2-dev" into sc-v2-dev
* changes:
  Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI
  Refactor build logic of boot-debug & vendor_boot-debug
  Skip building boot-(test-harness|debug).img if not needed
2021-12-10 05:36:27 +00:00
Yi-yo Chiang
161aa72014 [automerger skipped] Merge "sign_target_files_apks: adding --allow_gsi_debug_sepolicy" into sc-v2-dev am: 782fece23d -s ours am: 09b12ac59e -s ours
am skip reason: Merged-In I56ed328a9ae70cf49dbd3c6efb5a4a8c54e1b7a7 with SHA-1 2a781692ae is already in history

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

Change-Id: Ib1de35be345893570a1ac1fcc7821af9e250cdeb
2021-12-10 04:54:00 +00:00
Yi-yo Chiang
6f0f07c399 [automerger skipped] Merge "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" into sc-v2-dev am: a03f18f45d -s ours am: 70925239c0 -s ours
am skip reason: Merged-In I9c3dad8bb6c5fa88b16762193446dc7e54f326c8 with SHA-1 0a468fe904 is already in history

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

Change-Id: I6d0070aeaf384f8b86af90100a43049e76c6e5ab
2021-12-10 04:53:55 +00:00