StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,930 Commits 1 Branch 0 Tags
54ab3cf7b33c06a256a0132a5fb90117966b314a
Commit Graph

99930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
54ab3cf7b3 Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main am: 6ed53f2e44 
Original change: https://android-review.googlesource.com/c/platform/build/+/3249611

Change-Id: Icc6f1bd00a05d478da2311fa13d909c79868f729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 04:37:45 +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
58ff2ba627 Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main am: 9d3787b166 
Original change: https://android-review.googlesource.com/c/platform/build/+/3248862

Change-Id: I3aad2af970caf38cf32ffb7a5e28178591ec2574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 23:56:21 +00:00
Steven Moreland
9d3787b166 Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main 2024-09-03 23:44:16 +00:00
Treehugger Robot
364dca6ca5 Merge "aconfig: Use LazyLock rather than lazy_static" into main am: 36a352cd02 
Original change: https://android-review.googlesource.com/c/platform/build/+/3252494

Change-Id: I94320dad1867cb3c49c4e446365fb4de4634be5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 17:00:07 +00: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
Treehugger Robot
5cf179d193 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b -s ours am: dcc189e724 -s ours 
am skip reason: contains skip directive

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

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

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

Change-Id: Ide124b2fa390693793ff9991cb83e082f1771380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-01 05:55:09 +00:00
Automerger Merge Worker
8fd91cc919 Merge changes from topic "am-c7ae5aac1ddb4a3497131b161eb48568" into main am: 1bc29898e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091

Change-Id: I2e3d19370c42d72171449b9b4d37945e15ce45bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-01 05:45:46 +00:00
Treehugger Robot
5adff03c34 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b -s ours am: 49c3d6e71d -s ours 
am skip reason: contains skip directive

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

Change-Id: Iad4ec85f3f4210fafd7ae9c5152e09f8ca9dc75b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-01 05:45:43 +00:00
Treehugger Robot
dcc189e724 [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: I77dc97ce69e4a03be325b1e2682414fd9b9ce903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-01 05:45:02 +00:00
Tongbo Liu
d61635fa07 [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: I445f9330f1cc8f4ad7277f9dc34c409c9deab902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-01 05:44:56 +00: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
f4565686e4 Merge "java reader reads directly from map" into main am: 9f254c6b5d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3251572

Change-Id: I9e3d941414a961bbce2f5ef507bb77f8b37536b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 21:14:05 +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)
ad531c35b0 Merge "Revert "Support incremental dev option OTA during signing"" into main am: dbba064366 
Original change: https://android-review.googlesource.com/c/platform/build/+/3250456

Change-Id: Iee71e26a88b5d29d9df8115cd7beae18673cbdff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 07:28:31 +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
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
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
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
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
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