Yuxin Hu
9dfc376c19
Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor
...
This is a change cherry-picked from aosp:
https://r.android.com/2560175
Merged-In: I0fb881962ab77abd18f05d33393c4ee11694109c
Bug: b/270994705
Test: m -j45; flash and check Pixel 7 boots fine
atest CtsAngleIntegrationHostTestCases
Change-Id: I4632ff64bc26623c796b992a71761a754149955a
2023-04-26 21:02:13 +00:00
Treehugger Robot
9362cc8e1c
Merge "Fix duplicate super_empty.img" am: 67ca3c05c7
am: 8670880361
am: 0e04817b44
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970
Change-Id: I10aaf2dd5d7f68307d081f0f23a5b1a9831f19e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:43:22 +00:00
Treehugger Robot
e9b57353f7
Merge "Try with search_path for some avb path args" am: b7a45ea13d
am: 56c66e00bf
am: e313385cba
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380
Change-Id: Ib69a5ea56f160307cf9b36c5898545ac6b4c122c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:40:22 +00:00
Treehugger Robot
0e04817b44
Merge "Fix duplicate super_empty.img" am: 67ca3c05c7
am: 8670880361
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970
Change-Id: I01db0c5e3d039df6a61c880d7a1cfeaa8dba7967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:05:20 +00:00
Treehugger Robot
e313385cba
Merge "Try with search_path for some avb path args" am: b7a45ea13d
am: 56c66e00bf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380
Change-Id: I10d545710dcdbd4b0c203ae316f72a88cf7d7ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:03:36 +00:00
Treehugger Robot
8670880361
Merge "Fix duplicate super_empty.img" am: 67ca3c05c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970
Change-Id: I15da5d8b64dd98afc62040aad78ea2169f75b067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 21:36:11 +00:00
Treehugger Robot
56c66e00bf
Merge "Try with search_path for some avb path args" am: b7a45ea13d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380
Change-Id: I4061c3cb39ab7cd4800cc6e4bb08aadbf47b46c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 21:35:02 +00:00
Treehugger Robot
67ca3c05c7
Merge "Fix duplicate super_empty.img"
2023-04-17 21:19:13 +00:00
Treehugger Robot
b7a45ea13d
Merge "Try with search_path for some avb path args"
2023-04-17 20:43:12 +00:00
Alex Buynytskyy
cf2e6a745e
Merge "Finalization script fixes." am: 2ba40b5be6
am: 510ada3933
am: d0b8fd305b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2538137
Change-Id: I2eae33dc683564b7022194d9e84d0f0c5608aa87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 16:59:18 +00:00
Kelvin Zhang
aecdc18222
Fix duplicate super_empty.img
...
When calling add_img_to_target_files twice, super_empty.img will be
written twice, and resulting zip would contain duplicate entries.
Test: th
Bug: 278522974
Change-Id: I2419d0c4f8b04f876a8cc69a1517f59cab94d75d
2023-04-17 09:52:39 -07:00
Alex Buynytskyy
d0b8fd305b
Merge "Finalization script fixes." am: 2ba40b5be6
am: 510ada3933
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2538137
Change-Id: I19bbf7043b8869d9b17b102e1dd8182d3d11e605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 16:26:32 +00:00
Alex Buynytskyy
510ada3933
Merge "Finalization script fixes." am: 2ba40b5be6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2538137
Change-Id: I58becfef52885d057df9a748518ea7a1ba85c2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 15:57:00 +00:00
Alex Buynytskyy
2ba40b5be6
Merge "Finalization script fixes."
2023-04-17 15:26:16 +00:00
Alex Buynytskyy
f7a5e2fa4b
Finalization script fixes.
...
- actually do the first step instead of just logging a message,
- make sure extension SDK bump gets picked up by the topic,
- fix the resources_sdk_int in first step, and unfix in the second.
Bug: 278246368
Fixes: 278246368
Test: local run
Change-Id: I0d0f4e2ec7f0b584b9fc14a545cfec73a9fcbdea
2023-04-16 21:15:18 -07:00
Treehugger Robot
d6ff8ca1c5
Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2bad8
am: 42cfbe4f1a
am: d488ea8f83
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2538946
Change-Id: Ib1a3f63826d04e16d879c51789e7beca08f5fd1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 22:11:17 +00:00
Treehugger Robot
d488ea8f83
Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2bad8
am: 42cfbe4f1a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2538946
Change-Id: I623a58bf133b2f869044bb4414d58ba1a0f83d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 21:41:12 +00:00
Treehugger Robot
42cfbe4f1a
Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2bad8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2538946
Change-Id: I9aa503574c3ca689161fdcfe1618ec79821a973a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 21:11:36 +00:00
Treehugger Robot
3fb8d2bad8
Merge "Fix the following issues mentioned in Pixel SBOM review."
2023-04-15 20:34:52 +00:00
David Anderson
e78f998ebf
Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc
am: 70e4fa03b7
am: 236b709dcd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094
Change-Id: I1aaa20e89e874992ba7525da3df7d7cc3175575b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 06:49:27 +00:00
Wei Li
5290825452
Fix the following issues mentioned in Pixel SBOM review.
...
1) PackageSupplier should be NOASSERTION if there is no homepage
information in METADATA file of source packages
2) PackageDownloadLocation of upstream packages should be NOASSERTION if
there is no code repository URL in METADATA file of source packages
Test: CIs
Test: atest --host sbom_writers_test
Change-Id: I8a0298b7bacc2f96555f9d7dde0d21ada8c6b564
2023-04-15 06:05:32 +00:00
David Anderson
236b709dcd
Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc
am: 70e4fa03b7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094
Change-Id: I87172391727ae2b8fe4735aa1f7c1c9bef11098c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 06:01:17 +00:00
David Anderson
70e4fa03b7
Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094
Change-Id: I5c67e68393a2b9b7080c27f9299193486d78a3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 05:31:03 +00:00
David Anderson
23c2df71bc
Merge "ota_from_target_files: Disable XOR on <T vendor."
2023-04-15 04:52:46 +00:00
Treehugger Robot
98145fb730
Merge "Revert "Remove all ZIP64LIMIT hack"" am: 7b640806da
am: 78667a4692
am: 4fdafe37f3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535093
Change-Id: I603ae7959d332c315bd9db87404ed9030f3e92ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 03:13:28 +00:00
Dennis Song
2009c248db
Merge "Include META/*
in the vendor item list when rebuild-sepolicy" am: 5da012adb0
am: e890d0008c
am: 2e63bdb6d0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535541
Change-Id: I05d7dcd5f78bfc37fbf42cda8db638e369f072cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 03:13:07 +00:00
Treehugger Robot
4fdafe37f3
Merge "Revert "Remove all ZIP64LIMIT hack"" am: 7b640806da
am: 78667a4692
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535093
Change-Id: I2b4cdec89bc9f5ccfc423dd93bef393902a612f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 02:41:44 +00:00
Dennis Song
2e63bdb6d0
Merge "Include META/*
in the vendor item list when rebuild-sepolicy" am: 5da012adb0
am: e890d0008c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535541
Change-Id: I8600fd1e1a057eb53cc803f29620c7e46c329e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 02:41:26 +00:00
Treehugger Robot
78667a4692
Merge "Revert "Remove all ZIP64LIMIT hack"" am: 7b640806da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535093
Change-Id: I315fd1f9274cfda7b45c84b229ca6d6f040aa3a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 02:26:07 +00:00
Dennis Song
e890d0008c
Merge "Include META/*
in the vendor item list when rebuild-sepolicy" am: 5da012adb0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2535541
Change-Id: I2a38a896019d5f295dc0230f4496d91c31118f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 01:56:21 +00:00
Treehugger Robot
7b640806da
Merge "Revert "Remove all ZIP64LIMIT hack""
2023-04-15 01:48:58 +00:00
Dennis Song
5da012adb0
Merge "Include META/*
in the vendor item list when rebuild-sepolicy"
2023-04-15 01:15:44 +00:00
Florian Mayer
074dce314c
Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a
am: b98ff26c7d
am: aca0515f1b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599
Change-Id: Ibd295e9a35a9494fae156090330274173cecab14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 00:42:08 +00:00
Florian Mayer
aca0515f1b
Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a
am: b98ff26c7d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599
Change-Id: I4ea6e13d7297e5b6546475bd55428c1bec6a5fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:55:55 +00:00
Florian Mayer
b98ff26c7d
Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599
Change-Id: Ibd72c47073253b10e45bcddfaaf8e24617dc02b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:38:37 +00:00
Florian Mayer
ed97847d9a
Merge "Include hwasan lib and runtime on arm64 system images"
2023-04-14 23:27:56 +00:00
David Anderson
1c59617820
ota_from_target_files: Disable XOR on <T vendor.
...
Bug: N/A
Test: ota_from_target_files
Change-Id: Ia9093a3c3f79d88f98f0777e8a0f8c72741055b8
2023-04-14 16:01:55 -07:00
Treehugger Robot
55decf2e29
Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." am: ebf41e9a91
am: 28fc5a97a7
am: 074bfc1264
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2525827
Change-Id: I0391804c0924a64ae58b71e99815cecd6c078309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 21:56:20 +00:00
Treehugger Robot
3bc1d4b99b
Merge "Order entries in apex_info.pb" am: 6fb4c8dcee
am: f4c40a7eb2
am: 1b07bfec46
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083
Change-Id: I55e34ce4dfb725158af0abacd814e8d638d97413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 21:56:05 +00:00
Kelvin Zhang
f92f7f046a
Revert "Remove all ZIP64LIMIT hack"
...
This reverts commit 37a4290909
.
Reason for revert: b/278156419
Change-Id: I67ea667619a9623be849d911993010ef0f0bfd88
2023-04-14 21:32:54 +00:00
Treehugger Robot
074bfc1264
Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." am: ebf41e9a91
am: 28fc5a97a7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2525827
Change-Id: I1e65b41eedd122d3258270a78168ef2ec83e60c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 21:23:29 +00:00
Treehugger Robot
1b07bfec46
Merge "Order entries in apex_info.pb" am: 6fb4c8dcee
am: f4c40a7eb2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083
Change-Id: Ia8830c6718644b7239c8b0be629b5bba5518597f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 21:23:19 +00:00
Treehugger Robot
28fc5a97a7
Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." am: ebf41e9a91
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2525827
Change-Id: I547848b6a2eb24acf6f375e759015c2a5188c8bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 20:55:18 +00:00
Treehugger Robot
f4c40a7eb2
Merge "Order entries in apex_info.pb" am: 6fb4c8dcee
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083
Change-Id: I1cb8e4aca08ea4298c5e832087c088ed958795a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 20:55:03 +00:00
Treehugger Robot
ebf41e9a91
Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly."
2023-04-14 20:43:58 +00:00
Treehugger Robot
6fb4c8dcee
Merge "Order entries in apex_info.pb"
2023-04-14 20:33:18 +00:00
Håkan Kvist
01e381954b
Order entries in apex_info.pb
...
Adding the entries in apex_info.pb in sorted order makes it easier to
compare ota packages generated between the same source and target on
different computers/environments, ideally the generated ota zips should
be identical.
os.listdir() was used to find the apex files which should be
included in apex_info.pb. listdir() does not guarantee any order,
solution is to sort the result to ensure consistent order.
Bug: 278095305
Test: Manual. Confirm that apex_info.pb is generated sorted
protoc --decode_raw < apex_info.pb
Change-Id: I2851d207f828a6ac31e63e20c9025965ac4b0eba
2023-04-14 10:36:04 +02:00
Dennis Song
09f5c5dc0b
Include META/*
in the vendor item list when rebuild-sepolicy
...
To ensure that `AddImagesToTargetFiles` can still be used with
vendor item list that do not specify all of the required META/
files, those files should be included by default.
Test: atest --host releasetools_test
Bug: 278133178
Change-Id: I5a04bfc43d405d6838028f2535ced2124dbd43aa
2023-04-14 12:13:42 +08:00
zhangyongpeng
707569711b
Try with search_path for some avb path args
...
If we can't find relative signing_helper path, try with the OPTIONS.search_path dir prefix, and integrate the avb_*_key_path for the same logic.
Test: Build && releasetools_test
Signed-off-by: zhangyongpeng <zhangyongpeng@xiaomi.com>
Change-Id: Ifb1096ddea90693668f3344eb242bf9725113d11
2023-04-14 12:12:47 +08:00
Ibrahim Kanouche
77dd8b7174
Merge "Added validation to SBOM generator" am: 8eed7f5ac6
am: bdc1b58380
am: 5f35c29870
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2529120
Change-Id: Iaba3e4dfa1e695ccc7f5a4bc31ab1d2e05d3e06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 01:55:14 +00:00