Commit Graph

96457 Commits

Author SHA1 Message Date
Treehugger Robot
675aef236a Merge "aconfig: fix formatting warnings" into main 2024-01-31 13:50:04 +00:00
Mårten Kongstad
6fdaa11d7c aconfig: fix formatting warnings
Update the rust toolchain to 1.75.0 and run `cargo fmt`.

Bug: N/A
Test: cargo fmt --check
Test: atest :all
Change-Id: I718c350f4c346b85ff3608f3101278c2ee776b36
2024-01-31 09:40:21 +01:00
LaMont Jones
c369db98a1 Merge "Add device_aconfig_declarations target" into main am: 2135347927
Original change: https://android-review.googlesource.com/c/platform/build/+/2937719

Change-Id: Ie9e6f2a3b50150fc9d0341803121a5d23b7fd949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30 23:59:52 +00:00
LaMont Jones
2135347927 Merge "Add device_aconfig_declarations target" into main 2024-01-30 23:25:25 +00:00
LaMont Jones
61b0f799e2 Add alias-release-config function
This should be used to declare that a release config is an alias for
another one.  Aliases have no release config files of their own, and are
primarily used to simplify continuous integration as releases happen.

Bug: None
Test: manual
Change-Id: Ife5eb1f8f4bf8e06832dc55bbc390ce2f741ebb8
2024-01-30 23:07:15 +00:00
LaMont Jones
55d5fc504b Override release configs in depth
When overriding a release config, make sure that the overriden config is
fully present (by processing any of its overrides) before overriding it.

Bug: None
Test: manual
Change-Id: I8d29c7ee7208acf7fe63876f617c5b9e2c26c434
2024-01-30 23:06:08 +00:00
Treehugger Robot
eb336b9a66 Merge "Fix doing preroll for postroll" into main am: f350b7afc7
Original change: https://android-review.googlesource.com/c/platform/build/+/2933371

Change-Id: Ie8e5e50b772b29063ca8d2ae2fcc650dda9f7c81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30 22:55:59 +00:00
Xin Li
b793162412 Merge "Merge Android 24Q1 Release (ab/11220357)" into aosp-main-future 2024-01-30 22:44:44 +00:00
Treehugger Robot
f350b7afc7 Merge "Fix doing preroll for postroll" into main 2024-01-30 21:59:01 +00:00
LaMont Jones
2e47c7bbd3 Add device_aconfig_declarations target
Building device_aconfig_declarations creates simplifies listing all
aconfig flags used on the device by creating a build artifact at:
$(OUT_DIR)/target/product/$(TARGET_PRODUCT)/device_aconfig_declarations.pb

Bug: b/308625757
Test: manual
Change-Id: Ic5eef9c6a26f7893b3f4bdfed2cd4ac82a54a8f9
2024-01-30 19:15:28 +00:00
Automerger Merge Worker
3cea02b698 Merge "Merge "Support test runnner option in auto generated test configs" into android14-tests-dev am: 7b944b6220" into main am: 59dad11fa9
Original change: https://android-review.googlesource.com/c/platform/build/+/2924816

Change-Id: Ie8c891930382531279f7aaf4af7c0dd54f549519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30 18:49:36 +00:00
Xin Li
e693b5037e Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I21eb7d5dc8cef9c1dd797ba1ab2ee830a8a5a42b
Change-Id: I42210485ad8f07e19408bef0e5a2af23f6a0e596
2024-01-30 10:33:42 -08:00
Automerger Merge Worker
59dad11fa9 Merge "Merge "Support test runnner option in auto generated test configs" into android14-tests-dev am: 7b944b6220" into main 2024-01-30 18:11:38 +00:00
Steven Moreland
8a29e9b345 Merge "Support test runnner option in auto generated test configs" into android14-tests-dev am: 7b944b6220
Original change: https://android-review.googlesource.com/c/platform/build/+/2924816

Change-Id: I742b21bf2cb2d3ea3aad49f70fa4dec5e8143a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30 18:11:27 +00:00
Dennis Shen
5fb01da739 Merge "aconfig: remove bucket_index from PackageTableNode/FlagTableNode struct" into main am: 4767d785c1
Original change: https://android-review.googlesource.com/c/platform/build/+/2932354

Change-Id: I59df9c45001095530555a1fa8e39fea45189c6bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30 15:51:34 +00:00
Dennis Shen
4767d785c1 Merge "aconfig: remove bucket_index from PackageTableNode/FlagTableNode struct" into main 2024-01-30 15:20:46 +00:00
Dennis Shen
eef9192987 aconfig: remove bucket_index from PackageTableNode/FlagTableNode struct
bucket index currently is a field in PackageTableNode/FlagTableNode, but this is
purely aux info that is never searilized or deserialized. Therefore we
should remove it from the struct definition. Instead aconfig should
define a wrapper struct that wraps around an instance PackageTableNode/FlagTableNode
as well as aux info like bucket_index.

Bug: 321077378
Test: atest aconfig.test && atest aconfig_storage_file.test
Change-Id: I20f2565d20b7feb5d39754e91cd6a9affb1f0e70
2024-01-30 15:16:29 +00:00
Kangping Dong
7610286ecc Merge "[Thread] add ot-ctl to userdebug for testing" into main am: e2799f42ef
Original change: https://android-review.googlesource.com/c/platform/build/+/2928052

Change-Id: I609866c3e1e9268c3c9c00917062babcf5bf9894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30 08:26:43 +00:00
Kiyoung Kim
f4c9330e24 Rename LOCAL_USE_VNDK
LOCAL_USE_VNDK property refers if the module uses VNDK, and this
property is being used to check if the module is installed in vendor or
product. However, the term no longer makes sense with VNDK deprecation,
so it should be renamed. Similar to change in aosp/2897612, rename
LOCAL_USE_VNDK as LOCAL_IN_VENDOR or LOCAL_IN_PRODUCT.

Bug: 316829758
Test: AOSP CF build succeeded
Change-Id: Icfd1707953eba2e29044468ab6728b39d7998048
2024-01-30 17:10:39 +09:00
Kangping Dong
e2799f42ef Merge "[Thread] add ot-ctl to userdebug for testing" into main 2024-01-30 07:50:48 +00:00
Dennis Shen
85addbc93a Merge "aconfig: add flag value query pub function" into main am: f39e4a2273
Original change: https://android-review.googlesource.com/c/platform/build/+/2932353

Change-Id: Ie905f382084810dc70d604a31efa2bcb128f3268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 21:34:32 +00:00
Steven Moreland
7b944b6220 Merge "Support test runnner option in auto generated test configs" into android14-tests-dev 2024-01-29 21:22:00 +00:00
Dennis Shen
f39e4a2273 Merge "aconfig: add flag value query pub function" into main 2024-01-29 20:48:48 +00:00
Treehugger Robot
e297eca95a Merge "Fix ext4 size estimates" into main am: 1cc902690e
Original change: https://android-review.googlesource.com/c/platform/build/+/2924814

Change-Id: I307e0853ab1298b9260c4f567f035509b9c06d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 20:09:40 +00:00
Daniel Zheng
fa24950134 Merge "Allow cow_version to be overwriteable" into main am: 6a34ceb68e
Original change: https://android-review.googlesource.com/c/platform/build/+/2924921

Change-Id: I7d27eb20a042c8714560f0db9aa01cf92e567c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 20:09:11 +00:00
Dennis Shen
7455bfa7a5 Merge "aconfig: add flag table offset query function" into main am: 9a76f645a2
Original change: https://android-review.googlesource.com/c/platform/build/+/2932350

Change-Id: Iaf3a110db36e224e2a03a2781a0061ee74ae32e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 20:07:36 +00:00
Dennis Shen
3e83375d08 Merge "aconfig: create package table query public function" into main am: 043a1eec4d
Original change: https://android-review.googlesource.com/c/platform/build/+/2929211

Change-Id: Iddcddacf77788236a40f5adae236404ae9f99814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 20:06:56 +00:00
Treehugger Robot
1cc902690e Merge "Fix ext4 size estimates" into main 2024-01-29 20:06:18 +00:00
David Dai
3e7671fd2d Merge "Propagate virtual cpufreq related flags to soong" into main am: d1316f463c
Original change: https://android-review.googlesource.com/c/platform/build/+/2928341

Change-Id: Ic78bb347d8d46f6eb7f66cd01091e26333b7836f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 20:04:31 +00:00
Daniel Zheng
6a34ceb68e Merge "Allow cow_version to be overwriteable" into main 2024-01-29 20:00:09 +00:00
Dennis Shen
9a76f645a2 Merge "aconfig: add flag table offset query function" into main 2024-01-29 19:47:23 +00:00
Dennis Shen
043a1eec4d Merge "aconfig: create package table query public function" into main 2024-01-29 19:47:15 +00:00
David Dai
d1316f463c Merge "Propagate virtual cpufreq related flags to soong" into main 2024-01-29 19:16:09 +00:00
Liz Kammer
864dd43c07 Update benchmarks to handle cog workflows
Test: run ./build/make/tools/benchmarks in a cog workspace
Change-Id: I421d1d08b4e90a79b8416486025229d4f3263fbe
2024-01-29 14:13:57 -05:00
Liz Kammer
f67a6e8114 Fix doing preroll for postroll
Test: ./build/make/tools/perf/benchmarks
Change-Id: Ib64ddd53ea9234dc2934fd6dea988add02729d29
2024-01-29 14:09:43 -05:00
Dennis Shen
78bea3d66c aconfig: add flag value query pub function
Bug: b/321077378
Test: atest aconfig_storage_file.test
Change-Id: I83dd93c5f8d640ddbe85493a470af68df1e3e69d
2024-01-29 18:54:13 +00:00
Treehugger Robot
024b777406 Merge "Remove workaround to copy reclient binaries" into main am: c4e6b40594
Original change: https://android-review.googlesource.com/c/platform/build/+/2923050

Change-Id: Ia317d6bf63bfa7c8e704e9b247b2188f53cde1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 18:15:28 +00:00
Treehugger Robot
c4e6b40594 Merge "Remove workaround to copy reclient binaries" into main 2024-01-29 17:21:38 +00:00
Treehugger Robot
c0e7137bf4 Merge "aconfig: fix workspace resolver warning" into main am: bc7f1a2e67
Original change: https://android-review.googlesource.com/c/platform/build/+/2932072

Change-Id: I1b0892c19ea2ead8e1f050039ea688728f0d3db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 15:26:08 +00:00
Dennis Shen
9fd970198d aconfig: add flag table offset query function
Bug: b/321077378
Test: atest aconfig.test; atest aconfig_storage_file.test
Change-Id: Ib0ec1ec809c65d8f9f1284e4214cfbb683812f1d
2024-01-29 15:11:55 +00:00
Treehugger Robot
bc7f1a2e67 Merge "aconfig: fix workspace resolver warning" into main 2024-01-29 14:52:58 +00:00
Dennis Shen
8aa9bbeb99 aconfig: create package table query public function
Bug: b/321077378
Test: atest aconfig.test
Change-Id: I097e8ebecff6d5d9e73738a7f80a63cb482bcfbe
2024-01-29 14:43:19 +00:00
Mårten Kongstad
edd678063c aconfig: fix workspace resolver warning
Fix the following warning:

  warning: virtual workspace defaulting to `resolver = "1"` despite one or more workspace members being on edition 2021 which implies `resolver = "2"`
  note: to keep the current resolver, specify `workspace.resolver = "1"` in the workspace root's manifest
  note: to use the edition 2021 resolver, specify `workspace.resolver = "2"` in the workspace root's manifest
  note: for more details see https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions

Further info: https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html

Bug: N/A
Test: cargo c # no warnings related to the resolver
Change-Id: I5ee546e4f2ba9e854026bf4baee380e89cf4a01b
2024-01-29 14:51:51 +01:00
Kangping Dong
503ed30891 [Thread] add ot-ctl to userdebug for testing
ot-ctl is a helper utility to control the ot-daemon system service for
development and testing.

This commit adds ot-ctl into /system/bin for userdebug images.

Bug: 322595971
Change-Id: Ic2440c4af14be303db637e9ab6b08785ef3b9f82
2024-01-29 02:20:35 +00:00
Dennis Shen
e184356379 Merge "aconfig: add aconfig_storage_metadata proto" into main am: dfb817c223
Original change: https://android-review.googlesource.com/c/platform/build/+/2928251

Change-Id: Id6173a23a30990e740c4a99bf12965d630dcdee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26 21:23:26 +00:00
Dennis Shen
dfb817c223 Merge "aconfig: add aconfig_storage_metadata proto" into main 2024-01-26 20:38:41 +00:00
Dennis Shen
035eade892 Merge "aconfig: create unit test targets for aconfig_protos and aconfig_storage_file crate" into main am: c7a1c76e28
Original change: https://android-review.googlesource.com/c/platform/build/+/2928090

Change-Id: I2383c69d6ee95c379912653d1b70aabab3ec66b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26 18:12:02 +00:00
Treehugger Robot
649c08739c Merge "Bump Java target from 1.7 to 1.8 in makefiles" into main am: bc32e2d878
Original change: https://android-review.googlesource.com/c/platform/build/+/2927752

Change-Id: I987fd266b58df3fc0c7c2f881599f9ca91a9eaa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26 18:11:50 +00:00
Ronish Kalia
48be05373a Merge "Add team rules under build/make" into main am: 2ebcaa2b2f
Original change: https://android-review.googlesource.com/c/platform/build/+/2927751

Change-Id: Ib3534cda9ce4498ab505427314b6c8c6addd8b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26 18:10:59 +00:00
Dennis Shen
997745dc13 aconfig: add aconfig_storage_metadata proto
Introduce a new proto to capture storage file location for each
container. This proto file will appeara as
/metadata/aconfig/storage_file_location.pb. Storage service daemon is
responsible for writing entires to it when a new storage file set is
available. The flag read lib will use this file to find the
corresponding storage file and mmap them.

Bug: b/321077378
Test: atest aconfig_storage_file.test
Change-Id: I226e76be895805dce52a075050dcd5b42d337be8
2024-01-26 18:02:07 +00:00