Commit Graph

96226 Commits

Author SHA1 Message Date
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
Aditya Choudhary
8f986c3faf Code metadata integration with Generator tool
Ignore-AOSP-First: CPing test_spec rule to udc-mainline-prod to support migration of test targets. Cherry pick of:aosp/2847033

Change-Id: Icf14b48bc777207ac7cc7a287a174c8de817339b
Merged-In: Icf14b48bc777207ac7cc7a287a174c8de817339b
2024-01-11 13:50:48 +00:00
Treehugger Robot
35c67b2df4 Merge "Metadata tool correction: Output empty proto in case of no input" into main am: 51665cf02b am: 105ea3d726
Original change: https://android-review.googlesource.com/c/platform/build/+/2906355

Change-Id: I34bd90985f4e69b541139b16a9177c5ba096260a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11 13:22:33 +00:00
Treehugger Robot
105ea3d726 Merge "Metadata tool correction: Output empty proto in case of no input" into main am: 51665cf02b
Original change: https://android-review.googlesource.com/c/platform/build/+/2906355

Change-Id: I5dd8f9271716e4fb648ad8772b772dfaa6f9bf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11 12:48:06 +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
Tongbo Liu
ca0ace3629 Modify the build rule of MTS and MCTS related tests in order to enable
module individual MTS/MCTS test suites to be ran.

Ignore-AOSP-First: MCTS will be tested internally first
Bug: 316484945
Test: m mcts, m mcts-<module>
Change-Id: I3c0dd561a7456e3139e493974072207d188d7348
2024-01-11 07:13:55 +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
Daniel Zheng
de2ab2202d Merge "Support configuring compression factor" into main am: d90afc1d98 am: 6937a04061
Original change: https://android-review.googlesource.com/c/platform/build/+/2901258

Change-Id: I6a13ad3885c3a4114588cc579e16a45e8a975bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-10 22:58:41 +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
Daniel Zheng
6937a04061 Merge "Support configuring compression factor" into main am: d90afc1d98
Original change: https://android-review.googlesource.com/c/platform/build/+/2901258

Change-Id: If887b11a3437261edeb9a64488334621e07300e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-10 21:42:37 +00:00
Daniel Zheng
d90afc1d98 Merge "Support configuring compression factor" into main 2024-01-10 21:06:42 +00:00
Almaz Mingaleev
e8397e56bb Merge "Use tzdata's flag in PRODUCT_PACKAGES." into main am: e882108ee5 am: c0ac71c469 am: 2b13850bf8
Original change: https://android-review.googlesource.com/c/platform/build/+/2901015

Change-Id: I41b0802e038daf2eba95a4aba176d83d4f1e9239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-10 16:15:58 +00:00
Almaz Mingaleev
2b13850bf8 Merge "Use tzdata's flag in PRODUCT_PACKAGES." into main am: e882108ee5 am: c0ac71c469
Original change: https://android-review.googlesource.com/c/platform/build/+/2901015

Change-Id: I51ae34e2056ccbb8cf9372ee737b378e31763c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-10 15:43:04 +00:00
Almaz Mingaleev
c0ac71c469 Merge "Use tzdata's flag in PRODUCT_PACKAGES." into main am: e882108ee5
Original change: https://android-review.googlesource.com/c/platform/build/+/2901015

Change-Id: I207c8d924469e69647f7f97ea032269a191e5846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-10 15:13:58 +00:00
Almaz Mingaleev
e882108ee5 Merge "Use tzdata's flag in PRODUCT_PACKAGES." into main 2024-01-10 14:36:11 +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
Dennis Shen
271f6d6dab Merge "assign value to soong config variable" into main 2024-01-09 18:47:03 +00:00
Almaz Mingaleev
4e3ae61b0c Use tzdata's flag in PRODUCT_PACKAGES.
Bug: 319103072

Test: m
Test: ls -l /apex/com.android.tzdata
Change-Id: I2499473e9bf324eb2950b774862c46a2b0a5fcf7
2024-01-09 11:01:37 +00:00
Colin Cross
4637dafb94 Remove last reference to SOONG_COLLECT_JAVA_DEPS
SOONG_COLLECT_JAVA_DEPS was uncondtionally enabled in
If30ad5dbabb6709f834134cbc9a513a9bdc9d9de, remove the conditional
check for disting the results.  The prevents rerunning Make analysis
in ASfP, which is setting SOONG_COLLECT_JAVA_DEPS=true.

Test: builds
Change-Id: Ibecbeeefda3fec43c8a54b5ff80835e331bab1fc
2024-01-08 14:28:48 -08:00
Fabián Cañas
9419d1d8b8 Merge "Fix numeric selection from lunch menu" into main am: 3939d1ca59 am: 113d445ec2 am: 7da0b50088
Original change: https://android-review.googlesource.com/c/platform/build/+/2898609

Change-Id: Ia56448bf5f74b9734cb8b41e55474f749ebf7e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 20:42:29 +00: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
Fabián Cañas
7da0b50088 Merge "Fix numeric selection from lunch menu" into main am: 3939d1ca59 am: 113d445ec2
Original change: https://android-review.googlesource.com/c/platform/build/+/2898609

Change-Id: I0f7c5e324b2d348f2771b0ff1f798f931621f97e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 19:50:32 +00:00
Wei Li
eb8396ea9c Merge "Add a package in the SBOM of framework_res.jar." into main am: 2b54123029 am: 583cd41197
Original change: https://android-review.googlesource.com/c/platform/build/+/2898093

Change-Id: I2181058eb5070e21c59adc5eb4797b0d2d52fd8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 19:50:18 +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
Fabián Cañas
113d445ec2 Merge "Fix numeric selection from lunch menu" into main am: 3939d1ca59
Original change: https://android-review.googlesource.com/c/platform/build/+/2898609

Change-Id: I3983d3655edfe625560654e70fe1a19ca96da252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 19:19:56 +00:00
Wei Li
583cd41197 Merge "Add a package in the SBOM of framework_res.jar." into main am: 2b54123029
Original change: https://android-review.googlesource.com/c/platform/build/+/2898093

Change-Id: I54e5831fdeae9bb42c04155892c0ca3349976674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 19:19:20 +00:00
Fabián Cañas
3939d1ca59 Merge "Fix numeric selection from lunch menu" into main 2024-01-08 19:06:02 +00:00
Steven Moreland
510e08aea2 Merge "Split finalization scripts between vFRC and sFRC." into main 2024-01-08 19:05:15 +00:00
Dennis Shen
82b8641b94 Merge "aconfig: create flag.map storage file" into main am: 9b5d19bdff am: 365a8024c7
Original change: https://android-review.googlesource.com/c/platform/build/+/2898261

Change-Id: I7281257e0f118e2687005ec0d09a1ec39964e817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 19:02:36 +00:00
Dennis Shen
3781c5bfa7 Merge "aconfig: update storage unit test case" into main am: 01fca9877b am: 9387ba093b
Original change: https://android-review.googlesource.com/c/platform/build/+/2898260

Change-Id: I53eef40fa4e7cbc4688f9711c1e6c82486028712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 19:02:32 +00:00
Treehugger Robot
e6cc1ae69c Merge "aconfig: simplify is_valid_container" into main am: 868f3e8dba am: cc2429aa94
Original change: https://android-review.googlesource.com/c/platform/build/+/2900893

Change-Id: I408bfbe23631152482f94890b901f3df9c9abd59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 19:02:17 +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
Dennis Shen
365a8024c7 Merge "aconfig: create flag.map storage file" into main am: 9b5d19bdff
Original change: https://android-review.googlesource.com/c/platform/build/+/2898261

Change-Id: I5ac299612e6de5953150fb46a249767b9acf3b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 18:08:34 +00:00
Dennis Shen
9387ba093b Merge "aconfig: update storage unit test case" into main am: 01fca9877b
Original change: https://android-review.googlesource.com/c/platform/build/+/2898260

Change-Id: Ica250f3c06b2cdc37ee53e23a78b183a9caf8ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 18:08:31 +00:00
Treehugger Robot
cc2429aa94 Merge "aconfig: simplify is_valid_container" into main am: 868f3e8dba
Original change: https://android-review.googlesource.com/c/platform/build/+/2900893

Change-Id: I7f61369ccb607e50b58515794f76646c31579fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 18:07:56 +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
Treehugger Robot
90af39ffe6 Merge "aconfig: remove trailing whitespace in test input" into main am: 0f2e089f97 am: 00c2e125a2
Original change: https://android-review.googlesource.com/c/platform/build/+/2897750

Change-Id: I6b9e1b7a308445b3ec4539f9db52f93cc24dfebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 15:39:25 +00:00
Treehugger Robot
934b1cead5 Merge "aconfig: Cargo.toml: remove obsolete dev-dependencies" into main am: 12a43e495e am: adc7723f5e
Original change: https://android-review.googlesource.com/c/platform/build/+/2897749

Change-Id: Id05fac3528fde8535dd0e4f44ef32ff554f89a7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 15:38:38 +00:00
Treehugger Robot
00c2e125a2 Merge "aconfig: remove trailing whitespace in test input" into main am: 0f2e089f97
Original change: https://android-review.googlesource.com/c/platform/build/+/2897750

Change-Id: I3aebe68dd7e3049113ef8a0c858e3fd4728c319b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 15:17:51 +00:00
Treehugger Robot
adc7723f5e Merge "aconfig: Cargo.toml: remove obsolete dev-dependencies" into main am: 12a43e495e
Original change: https://android-review.googlesource.com/c/platform/build/+/2897749

Change-Id: Ib04603f4f86182a07fdd215bcab65710eb3393c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-08 15:17:15 +00:00