Yu Liu
158b4df6f9
Merge "Tweak the CUJ scripts to make it work in CI." into main am: 15fb2a41b1
am: d0273e9ca8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2911571
Change-Id: I74ad3dfbd45f8495d459161e3408620ce18b6312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-18 05:48:06 +00:00
Yu Liu
cda84245af
Tweak the CUJ scripts to make it work in CI.
...
Bug: 318706915
Test: manual test
Change-Id: I0982d1d724ec05aee7a0d6bdaa05497745421674
2024-01-18 00:35:13 +00:00
Devin Moore
65a2aa24dd
Merge changes from topic "fina-vintf-fix" into main
...
* changes:
Capture queryview stderr and stdout in finalization scripts
Update vintf levels for finalization script
2024-01-17 21:52:52 +00:00
Tim Tsai
21fd6d814b
Merge "Fixed not mapping sdk_sandbox key to vendor key" into main am: 7cd5b313f6
am: ff22ed407c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2903807
Change-Id: I85e0eab1cf581c9b30e4ae8e25d71995c5b33979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 18:26:19 +00:00
Tim Tsai
7cd5b313f6
Merge "Fixed not mapping sdk_sandbox key to vendor key" into main
2024-01-17 17:08:07 +00:00
Devin Moore
395d5e32e2
Capture queryview stderr and stdout in finalization scripts
...
Sometimes the output wasn't grep-able and this fixes it.
Ignore-AOSP-First: b/304316873#comment10
Test: Run the bazel query command multiple times before/after
and verify it works 100% of the time after.
Bug: 320589170
Change-Id: Ic60d3318287353aa71fdeb2c540899d588a2d273
2024-01-17 16:51:10 +00:00
Devin Moore
196c1b5352
Update vintf levels for finalization script
...
This year's vintf levels changed from 9 to 202404, so the levels in the
finalization script need to change.
Ignore-AOSP-First: b/304316873#comment10
Test: ./finalize-vintf-resources.sh
Bug: 320589170
Change-Id: I2e9b3953233c8d032f44f379546919b9f3642a6f
2024-01-17 16:50:59 +00:00
Treehugger Robot
ec9729e476
Merge "Remove unnecessary calling of PayloadGenerator" into main am: 0562b343d1
am: 6014c0f910
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2900888
Change-Id: I69f759f4d29abbfaaa83203c86d5ba447495a186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 08:59:11 +00:00
Treehugger Robot
0562b343d1
Merge "Remove unnecessary calling of PayloadGenerator" into main
2024-01-17 07:18:51 +00:00
Daniel Zheng
75b7748fba
Merge "Update check to work with compression levels" into main am: b7b838fd3b
am: 8f90739f3f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2912702
Change-Id: I6336cda449f7da3343ec3b09a6c3b16872e4b96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 22:49:30 +00:00
Yu Liu
368ed21744
Merge "Properly report failures in the CUJ scripts" into main am: 5afa685f81
am: e75acf017d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2912200
Change-Id: Iea692d01e7f2f53ccdaa1a4e696c82af97ff6c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 22:49:18 +00:00
Daniel Zheng
b7b838fd3b
Merge "Update check to work with compression levels" into main
2024-01-16 21:45:40 +00:00
Yu Liu
5afa685f81
Merge "Properly report failures in the CUJ scripts" into main
2024-01-16 21:35:42 +00:00
Devin Moore
2d156106ce
Merge "Add new function to create a new compat matrix for finalization" into main
2024-01-16 21:35:19 +00:00
Daniel Zheng
15a36a14d6
Update check to work with compression levels
...
vabc_compression_param can be a combination of algorithm + level.
Updating this check so that it works with both.
Test: ota_from_target_files
Change-Id: I2f13ca31c728d7c8607ac085c9b663691f8dfa02
2024-01-16 12:41:01 -08:00
Yu Liu
c6576ad307
Properly report failures in the CUJ scripts
...
Bug: 318706915
Test: manual test
Change-Id: I25dc7908f354c09cb829070e6de86f6cdfa38dab
2024-01-16 19:27:45 +00:00
Devin Moore
a1339afbb3
Add new function to create a new compat matrix for finalization
...
Creates the next version of the file based on the previous.
Replaces the "level" value with the new one in the file.
Adds a new Android.bp module that inherits from the previous.
Adds the current matrix file unconditional to all builds.
Adds the new matrix file contintionally based on release config.
This is used in finalize-vintf-resources.sh.
Ignore-AOSP-First: b/304316873#comment10
Test: ./finalize-vintf-resources.sh
Bug: 279809333
Change-Id: Ic14b3b82a33af3cce7a738dce5ad48112b8fb33d
2024-01-13 00:21:44 +00:00
Dennis Shen
931c5de0f9
Merge "aconfig: create flag value file" into main am: 12eacc1e4e
am: 2ed4060eb8
am: 3ab524979a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2901788
Change-Id: I6ef2762c01d75a5935552408319aa533a11a15ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:35:51 +00:00
Dennis Shen
12eacc1e4e
Merge "aconfig: create flag value file" into main
2024-01-12 18:37:53 +00:00
Treehugger Robot
14548bbe85
Merge "aconfig: update cache arg to support multiple cache files" into main am: 45db966e90
am: c92f754bb5
am: a8864899db
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2907195
Change-Id: Id03c7e35c151dec89af56cf1db75172070b21754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 17:08:03 +00:00
Treehugger Robot
45db966e90
Merge "aconfig: update cache arg to support multiple cache files" into main
2024-01-12 14:28:19 +00:00
Dennis Shen
d4ea260758
aconfig: create flag value file
...
Create flag_value module to create flag value file. Flag value file
contains a header section at the start of the file, followed by a
boolean array.
Bug: b/312243587
Test: atest aconfig.test
Change-Id: If76660189d63073fbd477e1e447240e0cd029604
2024-01-12 13:44:51 +00:00
Treehugger Robot
4d3a7d65b9
Merge "aconfig: Print flags with namespace, and sort them" into main am: 375cb9ab07
am: 6a60a97bd4
am: 571913f617
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2874915
Change-Id: I5e08efff790d60cd63cef9d2bdc6ba7ce0ca954a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 07:31:26 +00:00
Treehugger Robot
375cb9ab07
Merge "aconfig: Print flags with namespace, and sort them" into main
2024-01-12 04:31:30 +00:00
Dennis Shen
b04919399d
Merge "aconfig: add flag type in flag table and remove info byte from value array" into main am: 88ec7f624f
am: ca09d7160b
am: c0f4fb73c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2902907
Change-Id: I821a73578a62ef1d80a441a7b847442b70fcc4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-11 20:52:19 +00:00
Dennis Shen
88ec7f624f
Merge "aconfig: add flag type in flag table and remove info byte from value array" into main
2024-01-11 18:43:18 +00:00
Dennis Shen
54b8195d00
Merge "aconfig: remove debug print out" into main am: ccec070038
am: 95d402514e
am: 4a2a198cf7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2905247
Change-Id: Ia8c76f3b54b7f81c4feffec404d75dec19bcd63b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-11 17:26:10 +00:00
Dennis Shen
cfb65827d8
aconfig: update cache arg to support multiple cache files
...
Bug: b/312243587
Test: atest aconfig.test
Change-Id: I6f5f9b5ca6e2a60b8aac9ea8bf3032b00b7af7da
2024-01-11 17:13:39 +00:00
Dennis Shen
d088650481
aconfig: add flag type in flag table and remove info byte from value
...
array
1, add flag type to the flag table. Before flag table only stores the
mapping from (package id, flag name) to (flag id u32). The original
intent is to do bitmasking on the top byte of flag id to indicate flag
type. Now split the flag id u32 to two u16, the first represent flag
type, the second represent flag id. So after the change, the flag table
now shows the following mapping:
(package id, flag name) -> (flag type as u16, flag id as u16)
2, originally we plan to store a info byte together with each flag
value. The info byte is used by storage service damemon to mark up the
flag status, such as if it is accepting server side flag push. After
internal discussion, it is better to just create the info bytes as
another file by storage service damemon. So that the value file is
purely a flag value array.
Bug: b/312243587
test: atest aconfig.test
Change-Id: I7f953076b4269cf786bc23723078290e5ebe10bc
2024-01-11 15:30:10 +00:00
Dennis Shen
ccec070038
Merge "aconfig: remove debug print out" into main
2024-01-11 15:02:43 +00:00
Treehugger Robot
a4716ab34d
Merge "Metadata tool correction: Output empty proto in case of no input" into main am: 51665cf02b
am: 105ea3d726
am: 35c67b2df4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2906355
Change-Id: I9e5f549cf2eba8d3f8715968154b200bae1d82bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-11 14:13:42 +00:00
Treehugger Robot
51665cf02b
Merge "Metadata tool correction: Output empty proto in case of no input" into main
2024-01-11 12:16:55 +00:00
Aditya Choudhary
f0670e89f4
Metadata tool correction: Output empty proto in case of no input
...
Change-Id: I85ca22574433ab164c303c1f6b0d29191e704cbb
2024-01-11 11:15:23 +00:00
Daniel Zheng
a9b01fe8be
Merge "Support configuring compression factor" into main am: d90afc1d98
am: 6937a04061
am: de2ab2202d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2901258
Change-Id: I399a1348c714b464c98d55291edec5479aa9fa2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-10 23:48:52 +00:00
Dennis Shen
25167e387f
aconfig: remove debug print out
...
Bug: b/312243587
Test: atest aconfig.test
Change-Id: Id1bd4b5a1e60a7906908a432f58d45d2a4a56248
2024-01-10 22:55:37 +00:00
Cloud You
0dbd877e5f
Fixed not mapping sdk_sandbox key to vendor key
...
Some apps are signed with default sdk_sandbox key.
It results in failure of GtsPackageSignatureTest
Bug: 318798881
Test: run gts -m GtsPackageSignatureTest
Change-Id: I676f48eb2844866f4e61af60d78026a87303d15a
2024-01-10 15:12:39 +08:00
Daniel Zheng
a567eae9ad
Support configuring compression factor
...
With the introduction of variable block sized compression. We want
ota_from_target_files to support a flag that confgures the max block
size for compression. This flag will be passed to delta_generator and
then used fro cow estimation + ota installation
Removing a function here as it looks like it's unused. We can modify the
specified values with ModifyTargetFilesDynamicPartitionInfo(). The other
function looks like it's just a wrapper.
Test: ota_from_target_files.
Change-Id: Ia17bf62d40f947ef1fbe543886f04d10acd5bcc9
2024-01-09 16:52:20 -08:00
Wei Li
14add3b123
Merge "Add a package in the SBOM of framework_res.jar." into main am: 2b54123029
am: 583cd41197
am: eb8396ea9c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2898093
Change-Id: Icabb0b99952663611a8a6aeeb53eea972a289a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-08 20:41:03 +00:00
Dennis Shen
b747c74296
Merge "aconfig: create flag.map storage file" into main am: 9b5d19bdff
am: 365a8024c7
am: 82b8641b94
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2898261
Change-Id: I84dce064a81551fef2f41ea0f7038bc32f1afd1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-08 19:33:46 +00:00
Dennis Shen
567c3449af
Merge "aconfig: update storage unit test case" into main am: 01fca9877b
am: 9387ba093b
am: 3781c5bfa7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2898260
Change-Id: Ia82072f654a7fca88e58496fd63d0e9e796a6ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-08 19:33:42 +00:00
Treehugger Robot
5293806407
Merge "aconfig: simplify is_valid_container" into main am: 868f3e8dba
am: cc2429aa94
am: e6cc1ae69c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2900893
Change-Id: Iff106b8a823d5efd989bb3f6654a76b2be2708ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-08 19:33:23 +00:00
Steven Moreland
510e08aea2
Merge "Split finalization scripts between vFRC and sFRC." into main
2024-01-08 19:05:15 +00:00
Wei Li
2b54123029
Merge "Add a package in the SBOM of framework_res.jar." into main
2024-01-08 18:53:35 +00:00
Wei Li
0268764c0e
Add a package in the SBOM of framework_res.jar.
...
Bug: 303906275
Test: m layoutlib dist
Change-Id: Ie7a0b97173643fc2cafbd9c7e5c6618ad9c68aeb
2024-01-08 09:34:42 -08:00
Dennis Shen
9b5d19bdff
Merge "aconfig: create flag.map storage file" into main
2024-01-08 17:30:39 +00:00
Dennis Shen
01fca9877b
Merge "aconfig: update storage unit test case" into main
2024-01-08 17:30:39 +00:00
Treehugger Robot
868f3e8dba
Merge "aconfig: simplify is_valid_container" into main
2024-01-08 17:28:19 +00:00
Treehugger Robot
4d5ac1fbb8
Merge "aconfig: remove trailing whitespace in test input" into main am: 0f2e089f97
am: 00c2e125a2
am: 90af39ffe6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2897750
Change-Id: If9664c3c0cd87210ab3bff3364ff54a5078fd988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-08 16:27:12 +00:00
Mårten Kongstad
32c6ef5e25
aconfig: simplify is_valid_container
...
str::split always returns at least one item (the entire string) if the
delimiter is not found. Simplify the implementation of
is_valid_container accordingly.
Bug: N/A
Test: atest aconfig.test
Change-Id: I3e92035309a7b019912710e42e69f9bdfa538795
2024-01-08 17:26:59 +01:00
Treehugger Robot
e778b1c540
Merge "aconfig: Cargo.toml: remove obsolete dev-dependencies" into main am: 12a43e495e
am: adc7723f5e
am: 934b1cead5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2897749
Change-Id: Iec62301973dcb7fe6841e787b5a7b0f9b562a8df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-08 16:26:06 +00:00