Commit Graph

99904 Commits

Author SHA1 Message Date
Inseob Kim
ae5a816be5 Merge "Move adb_keys to product partition" into main am: 1a3f842d48
Original change: https://android-review.googlesource.com/c/platform/build/+/3243935

Change-Id: Ia04f80cb4b86df614f9d4f3b1ce342f5d541c9bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-30 01:12:46 +00:00
Inseob Kim
1a3f842d48 Merge "Move adb_keys to product partition" into main 2024-08-30 01:08:19 +00:00
Steven Moreland
0b78a4cfd8 Merge "Support incremental dev option OTA during signing" into main am: 4713911b81
Original change: https://android-review.googlesource.com/c/platform/build/+/3236459

Change-Id: I1dde20dc24eefe6987632e2f92b496c6ae7d4ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 23:39:20 +00:00
Steven Moreland
4713911b81 Merge "Support incremental dev option OTA during signing" into main 2024-08-29 23:35:11 +00:00
Treehugger Robot
d0b36a410f Merge "Add boot_16k.img and dtbo_16k.img to target_files" into main am: 2091dc30e2
Original change: https://android-review.googlesource.com/c/platform/build/+/3236458

Change-Id: I1f4d2c41546df89e37af0085fb755f79981752f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 23:28:59 +00:00
Treehugger Robot
2091dc30e2 Merge "Add boot_16k.img and dtbo_16k.img to target_files" into main 2024-08-29 23:26:15 +00:00
Matthew DeVore
0dc32091ae Merge "Add missing -e flag to echo invocation" into main am: bbedca3d7b
Original change: https://android-review.googlesource.com/c/platform/build/+/3250151

Change-Id: Iad271c4bb1d0110263fbda9caec2572582ad4d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 22:32:54 +00:00
Matthew DeVore
bbedca3d7b Merge "Add missing -e flag to echo invocation" into main 2024-08-29 22:26:54 +00:00
Cole Faust
3c9e58c565 Merge changes I826b1ec6,I0667ef0e,Ie4481513 into main am: da669fa5f0
Original change: https://android-review.googlesource.com/c/platform/build/+/3247886

Change-Id: I499de7eb93d7399ae10b81918295838bb6e9505d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 22:14:19 +00:00
Cole Faust
da669fa5f0 Merge changes I826b1ec6,I0667ef0e,Ie4481513 into main
* changes:
  Add the list of makefiles that were also included by product config to dumpconfig.
  Add tracing for board config to dumpconfig
  Fix newline for dumpconfig
2024-08-29 22:07:41 +00:00
Kelvin Zhang
5fcaa1f635 Support incremental dev option OTA during signing
This allows incremental dev option to be used on release-key devices.
Boot images are signed during the signing process, and hence the dev
option OTAs(which are derivative of boot image) need to be re-generated.
Previously we only re-generate full OTAs, now we support incrementals
too.

Test: th
Bug: 339658378
Change-Id: I4755379b49ff8adf351ccaf76fe38f19c1685e9e
2024-08-29 13:38:45 -07:00
Kelvin Zhang
8948d13afc Add boot_16k.img and dtbo_16k.img to target_files
During signing, we need to re-generate dev option OTAs, as the 4K boot
images are getting signed with a different key. To allow generating
incremental OTAs for boot OTAs, include 16K variant of the boot images.

Test: th
Bug: 339658378
Change-Id: I0aafd5f48dbefeb2b86fd8bd93f6ce4d3f28a3cd
2024-08-29 13:38:45 -07:00
Luca Farsi
d8071df130 Merge "Implement get_build_targets_impl in GeneralTestsOptimizer" into main am: 0ad443b80c
Original change: https://android-review.googlesource.com/c/platform/build/+/3216811

Change-Id: I51a41bc98014093ef9b88c1ac90faad2a9c56ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 17:14:00 +00:00
Luca Farsi
0ad443b80c Merge "Implement get_build_targets_impl in GeneralTestsOptimizer" into main 2024-08-29 16:58:30 +00:00
Matthew DeVore
ff8b9adba3 Add missing -e flag to echo invocation
Without this, the \e... escape sequence is printed literally.

Change-Id: I6bdac0cc61073d52a718384a3c1349a964ffc71f
2024-08-29 15:38:40 +00:00
Treehugger Robot
0a79e2158c Merge "aconfig Rust: Support huge list of flags" into main am: d713353ab8
Original change: https://android-review.googlesource.com/c/platform/build/+/3247857

Change-Id: I679d7a46f43f3b00cd7792744a3552bd6a65ce8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 14:49:26 +00:00
Treehugger Robot
d713353ab8 Merge "aconfig Rust: Support huge list of flags" into main 2024-08-29 14:46:45 +00:00
William Escande
a8454c30ed aconfig Rust: Support huge list of flags
Test: m libbluetooth_aconfig_flags_rust
Test: atest aconfig.prod_mode.test.rust
Test: atest aconfig.test_mode.test.rust
Test: atest aconfig.force_read_only_mode.test.rust
Test: atest aconfig.test
Bug: 311772251
Bug: 362773105
Change-Id: I48e268fc783e491a045d1bb6298c2b3c87045722
2024-08-28 16:52:56 -07:00
Joe Onorato
248580cb41 Add the list of makefiles that were also included by product config to dumpconfig.
In this entry, the first list of files is the inherit-product stack, and
the second one is the list of files included by the file at the top of
the stack that just finished processing

Test: build/make/ci/dump_product_config
Change-Id: I826b1ec6fa1319b8f0cdfaacc6ccf999ce93d9f1
2024-08-28 20:21:31 +00:00
Joe Onorato
6dfeb795e0 Add tracing for board config to dumpconfig
Test: build/make/ci/dump_product_config
Change-Id: I0667ef0e4427d396cedb03eaf2a314a789947e98
2024-08-28 20:21:31 +00:00
Joe Onorato
b34578cf74 Fix newline for dumpconfig
Test: build/make/ci/dump_product_config
Change-Id: Ie4481513b58f589a00b092114135788b1c4c62cd
2024-08-28 20:21:31 +00:00
Treehugger Robot
11d717cd22 Merge "Implement SipHasher" into main am: d53df1b115
Original change: https://android-review.googlesource.com/c/platform/build/+/3243780

Change-Id: I5917a9b03103b335c2b6d6468f18365d12c7d6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 17:45:51 +00:00
Treehugger Robot
d53df1b115 Merge "Implement SipHasher" into main 2024-08-28 17:34:42 +00:00
Treehugger Robot
39603ad5c5 Merge "Update diff allowlist for soong system image build" into main am: 53c4ec42ad
Original change: https://android-review.googlesource.com/c/platform/build/+/3241532

Change-Id: Ia3b78cb0f99afe17c9cd1be80d76a48ed2ea7251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 17:24:20 +00:00
Treehugger Robot
00bda61743 Merge "Skip 24Q3 (ab/AP3A.240905.015.A2) in aosp-main-future" into aosp-main-future 2024-08-28 17:16:46 +00:00
Treehugger Robot
53c4ec42ad Merge "Update diff allowlist for soong system image build" into main 2024-08-28 17:16:43 +00:00
Zhi Dou
bca30dd13f Implement SipHasher
This change implements SipHasher in rust and java to make sure same
bytes array will be hashed into the same u64.

The implementation is needed, thus when rust, and java code read the
same flag file, they can find the same entry based on the same key.

Test: atest aconfig_storage_file.test.java aconfig_storage_file.test.cpp
Bug: 352078117
Change-Id: I2ce470039213a09a1df7637e60f4649b053fb2ea
2024-08-28 16:02:42 +00:00
Justin Yun
0fa47f4a54 Update diff allowlist for soong system image build
We already resolved files in system etc.
Remove them from the allowlist.

Bug: 346873717
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug && m
Change-Id: Ia38796aebe0e2e9a5d55e16f9c509c68214f687f
2024-08-28 06:22:25 +00:00
Inseob Kim
8774b552b8 Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main am: 58ef2deebf
Original change: https://android-review.googlesource.com/c/platform/build/+/3237921

Change-Id: Ie7b8b148c02758df3cf12995a98395a141cbc76f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:20:56 +00:00
Inseob Kim
58ef2deebf Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main 2024-08-28 00:15:14 +00:00
Jae Hoon Kim
766a3487ef Merge "core/Makefile: Add desktop update image target hook" into main am: 2366366e9f
Original change: https://android-review.googlesource.com/c/platform/build/+/3241411

Change-Id: I3f3242e276f55499e408f983484b7578dc1b9dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 22:31:41 +00:00
Jae Hoon Kim
2366366e9f Merge "core/Makefile: Add desktop update image target hook" into main 2024-08-27 22:29:46 +00:00
Xin Li
87fc60aa8b Skip 24Q3 (ab/AP3A.240905.015.A2) in aosp-main-future
Bug: 347831320
Merged-In: I9088349709d41a06309b4f3ce5e41bc07bd50e8e
Change-Id: I58b063185842cae47ae248763d860b3c6aec0c0c
2024-08-27 14:24:47 -07:00
Jae Hoon Kim
c6a9897f88 core/Makefile: Add desktop update image target hook
.. allowing for targets to trigger update image builds.

Bug: b:357929709
Test: m dist
Flag: EXEMPT desktop only change
Change-Id: I66d4a76daf7b163df60d94c4ba30bb377674b84f
2024-08-27 20:15:57 +00:00
Luca Farsi
b9c54644a2 Implement get_build_targets_impl in GeneralTestsOptimizer
Implement functionality in GeneralTestsOptimizer to find what targets to
build.

This logic is fairly complex and involves checking for test
configs that download general-tests.zip. Then the configs are checked to
see if they're proper test mapping tests (if they use the
'test-mapping-test-group' option). If they are, then TEST_MAPPING
modules are scanned to see if the list of changed files would cause any
test mapping modules to run. The tests are then further filtered by
test-mapping-test-groups used in the test configs.

In case that a test uses general-tests.zip but does not specify
'test-mapping-test-group' then all bets are off and general-tests.zip
is built in its entirety.

package_outputs is still unimplemented so this will need to be
implemented before the optimization can be enabled.

Test: atest build_test_suites_test && atest optimized_targets_test
Bug: 358215235
Change-Id: I6a7eebfd1b06b380799292eb2019ac17c9af5367
2024-08-27 11:15:25 -07:00
Inseob Kim
ff517c6151 Move adb_keys to product partition
/adb_keys will be moved to /product/etc/security as it's a
product-specific file. To prevent regression, /adb_keys will be a
symlink to the new location.

Bug: 353430323
Test: boot and connect adb with ADB_VENDOR_KEYS
Change-Id: Ieee2974925df4b3797483c96b78a0d2a2aa9a57d
2024-08-27 17:48:46 +09:00
Pindar Yang
9f837db707 Merge "Revert "Export variable to soong for converting vintf_compatibil..."" into main am: da0dfeb705
Original change: https://android-review.googlesource.com/c/platform/build/+/3235657

Change-Id: I9088349709d41a06309b4f3ce5e41bc07bd50e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 03:33:33 +00:00
Pindar Yang
da0dfeb705 Merge "Revert "Export variable to soong for converting vintf_compatibil..."" into main 2024-08-27 03:25:23 +00:00
Pindar Yang
1c8d6ea6f8 Revert "Export variable to soong for converting vintf_compatibil..."
Revert submission 3195743-compatibility_matrix

Reason for revert: Build Break, Bug: 361227456

Reverted changes: /q/submissionid:3195743-compatibility_matrix

Change-Id: I7dc43c32d3ada03fd319f47892049b5f33cfcfb4
2024-08-27 03:23:40 +00:00
Spandan Das
259692c6f3 Merge "Remove some files from packaging allowlist" into main am: 03b680d4ba
Original change: https://android-review.googlesource.com/c/platform/build/+/3241405

Change-Id: I7b3ac632a4eabc19702c5d9460ec7d6ca3606fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 23:29:20 +00:00
Spandan Das
03b680d4ba Merge "Remove some files from packaging allowlist" into main 2024-08-26 23:26:10 +00:00
Luca Farsi
f8561c60a7 Merge "add BuildContext class and fix enabled features" into main am: b2c2fe8856
Original change: https://android-review.googlesource.com/c/platform/build/+/3236364

Change-Id: I8a0f8474a1a206da0cbbae60fe2fd6fb635cdd0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 21:30:06 +00:00
Spandan Das
0e695737e4 Remove some files from packaging allowlist
These files are symlinks. With https://r.android.com/3200722, these
should be available in the soong built system image.

Test: presubmits
Change-Id: I4acb05ed8498dc8b7aac76e4c91b9173ed3d6574
2024-08-26 21:29:24 +00:00
Luca Farsi
b2c2fe8856 Merge "add BuildContext class and fix enabled features" into main 2024-08-26 21:21:30 +00:00
Treehugger Robot
61fc11ac5a Merge "Optimize: Reduce vendor target build files" into main am: 95feb949e1
Original change: https://android-review.googlesource.com/c/platform/build/+/3235583

Change-Id: I255a2d9269d384da754fe0559ba5fd55f78a9016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 21:13:53 +00:00
Treehugger Robot
95feb949e1 Merge "Optimize: Reduce vendor target build files" into main 2024-08-26 21:11:21 +00:00
Luca Farsi
b130e791b6 add BuildContext class and fix enabled features
Add a BuildContext class to simplify parsing the build context dict, and
fix the parsing of enabledBuildFeatures, which was being parsed as a
list of strings when it's actually a list of dicts like:
[{'name': '<feature_name>'}]

Test: atest build_test_suites_test
Bug: 361605425
Change-Id: I6424c444daf1582e92313c39f43207cb274aa78f
2024-08-26 12:26:48 -07:00
Treehugger Robot
17874e0299 Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main am: 1dbf5fb045
Original change: https://android-review.googlesource.com/c/platform/build/+/3242201

Change-Id: Id9e9606fd5f01c47a281a7aba6b056dcd394d90b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 16:55:57 +00:00
Treehugger Robot
1dbf5fb045 Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main 2024-08-26 16:47:43 +00:00
Aaron Homer
58992a6052 Revert "Fix problem of RepackApexPayload when using option --signing_args"
This reverts commit 5ebc4febe6.

Reason for revert: This is causing the signing args to be improperly passed to apexer, treating them as if they are not specified as all.

Change-Id: Ifa0f8444a4a1871802316511b0ff0735f3350b2c
Bug: 361784913
2024-08-26 15:21:26 +00:00