Commit Graph

98677 Commits

Author SHA1 Message Date
Ziwei Zhang
abbea01558 [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 -s ours
am skip reason: contains skip directive

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

Change-Id: Idd6a52815413e3ef7b764db58c1d82bcf85c88cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 02:46:13 +00:00
Xin Li
444cd45ec7 Merge "Revert "Remove messaging package."" into main 2024-09-05 00:23:44 +00:00
Treehugger Robot
9263e3e447 Merge "Don't show container in list new storage" into main 2024-09-04 19:24:25 +00:00
Ted Bauer
c50121613d Don't show container in list new storage
Change-Id: I24263e244d5b86ef066cd2efd511a890b03bf6e7
Test: m
Bug: 324436145
2024-09-04 18:11:59 +00:00
Colin Cross
d41d4149f6 Merge "Move checkbuild targets of Soong modules into Soong" into main 2024-09-04 17:12:03 +00:00
Priyanka Advani (xWF)
3b6d8085f0 Revert "Remove messaging package."
Revert submission 3241481-remove-messaging-package

Reason for revert: Droidmonitor created revert due to b/364617310, b/364626927, b/364617560

Reverted changes: /q/submissionid:3241481-remove-messaging-package

Change-Id: I64b5e27f19a46dddd9a6a8c20c6a09367d2a3c18
2024-09-04 17:03:14 +00:00
Marybeth Fair
2610f480aa Merge "Add a function to fingerprint flag/offset info." into main 2024-09-04 15:37:59 +00:00
Elliott Hughes
8db9956a75 Merge "Remove messaging package." into main 2024-09-04 14:02:00 +00:00
Ziwei Zhang
660e2ef531 RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS.
Test: presubmit
Bug: 348121714
Change-Id: I7f24f8f8351966205c5afec2a0b8191266086864
2024-09-04 07:50:46 +00:00
Treehugger Robot
6ed53f2e44 Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main 2024-09-04 04:27:06 +00:00
Steven Moreland
9d3787b166 Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main 2024-09-03 23:44:16 +00:00
Marybeth Fair
df1b7d1d81 Add a function to fingerprint flag/offset info.
Uses SipHasher implementation added to the project. Ideally the output
would remain consistent between builds (though the worst case of an
updated algorithm would be a string lookup for cross-container reads
only).

Sort the flags first so everything is always added to the hasher in the
same order - note this code is only run at build time, not runtime.

Next step is to write this fingerprint into the package.map file and
introduce a flag to guard this change.

Bug: 316357686
Test: atest aconfig.test
Change-Id: Ie5f34541d982dfa120ffb05fc0790603689d47c0
2024-09-03 16:24:51 -04:00
Treehugger Robot
36a352cd02 Merge "aconfig: Use LazyLock rather than lazy_static" into main 2024-09-03 16:56:06 +00:00
Andrew Walbran
d3878575ac aconfig: Use LazyLock rather than lazy_static
Now that we have Rust 1.80 LazyLock is available in the standard library
so we no longer need to use external crates such as lazy_static.

Bug: 364211748
Test: atest aconfig.test
Test: atest aconfig.prod_mode.test.rust
Test: atest aconfig.test_mode.test.rust
Test: atest aconfig.force_read_only_mode.test.rust
Change-Id: If2862eaf20065c118daa9fc51e9fb403b99dada3
2024-09-03 17:01:49 +01:00
Automerger Merge Worker
1bc29898e6 Merge changes from topic "am-c7ae5aac1ddb4a3497131b161eb48568" into main
* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603 -s ours
2024-09-01 05:33:18 +00:00
Treehugger Robot
49c3d6e71d [automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b -s ours
am skip reason: contains skip directive

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

Change-Id: Ifa0ed8041fa90f52ace20b6031361d0d73cdcc13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-01 05:33:02 +00:00
Tongbo Liu
74f262f6fe [automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603 -s ours
am skip reason: contains skip directive

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

Change-Id: If9462c7573c483063e8cd3e5eea17150205ba061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-01 05:32:57 +00:00
Treehugger Robot
426ac7045b Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev 2024-09-01 05:18:06 +00:00
Steven Moreland
357d069f7f Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND.
Hint to partners this will go away. We have limited
testing of this option, and we shouldn't maintain two
ways of handling NDK AIDL variants. So, this way
we can remove it in the future. :D

Bug: 161456198
Test: build
Change-Id: I5ae43b4f1b6c0d7253e82caeb338b69b7e00fdb6
2024-08-30 23:28:23 +00:00
Treehugger Robot
9f254c6b5d Merge "java reader reads directly from map" into main 2024-08-30 21:07:59 +00:00
Zhi Dou
9c85770aa4 java reader reads directly from map
This commit changes java reader to directly read the flag value from the
map file instead of load the entire file.

Change-Id: Icee42d99506894da1e3e32a31c6554895719de7b
Test: atest aconfig_storage_read_api.test.java aconfig_storage_file.test.java
Bug: 352078117
2024-08-30 18:49:07 +00:00
Pechetty Sravani (xWF)
dbba064366 Merge "Revert "Support incremental dev option OTA during signing"" into main 2024-08-30 07:18:10 +00:00
Inseob Kim
1a3f842d48 Merge "Move adb_keys to product partition" into main 2024-08-30 01:08:19 +00:00
Priyanka Advani (xWF)
29c7842c02 Revert "Support incremental dev option OTA during signing"
This reverts commit 5fcaa1f635.

Reason for revert: Droidmonitor created revert due to b/363090380.

Change-Id: I366b12a303190f73e6ac16a1fcff83b1e16ebf2d
2024-08-30 00:33:08 +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
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
bbedca3d7b Merge "Add missing -e flag to echo invocation" into main 2024-08-29 22:26:54 +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
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
d713353ab8 Merge "aconfig Rust: Support huge list of flags" into main 2024-08-29 14:46:45 +00:00
Herbert Xue
3e3cbeb3a5 Move COMPATIBILITY.tradefed_tests_dir to proper place
Bug: 341873065
Test: presubmit
Change-Id: Ibd99b07b8548eafb72254fda2a248b9ec32ee8ef
2024-08-29 14:46:50 +08: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
d53df1b115 Merge "Implement SipHasher" into main 2024-08-28 17:34:42 +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
58ef2deebf Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main 2024-08-28 00:15:14 +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
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
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
03b680d4ba Merge "Remove some files from packaging allowlist" into main 2024-08-26 23:26:10 +00:00