Commit graph

95988 commits

Author SHA1 Message Date
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
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
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
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
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
Dennis Shen
c7a1c76e28 Merge "aconfig: create unit test targets for aconfig_protos and aconfig_storage_file crate" into main 2024-01-26 18:01:54 +00:00
Treehugger Robot
bc32e2d878 Merge "Bump Java target from 1.7 to 1.8 in makefiles" into main 2024-01-26 17:44:00 +00:00
Ronish Kalia
2ebcaa2b2f Merge "Add team rules under build/make" into main 2024-01-26 17:03:18 +00:00
Sorin Basca
d35691dabe Bump Java target from 1.7 to 1.8 in makefiles
Bug: 320294595
Test: m
Change-Id: I66f3ebf2d6979a8b033c2f475fa21bae26ca97cd
2024-01-26 16:44:33 +00:00
Aditya Choudhary
338bc8ff2e Add team rules under build/make
Bug: 304529413

Change-Id: If22c562ebdea21f4c9c6c98c4cfb3acb2c64c628
2024-01-26 15:51:01 +00:00
Treehugger Robot
409f44691d Merge "Add SatelliteClient to the product packages" into main am: 0011f62146
Original change: https://android-review.googlesource.com/c/platform/build/+/2929411

Change-Id: Ic1d22c46c0665a480bc65bd011fefaa3148b6735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26 15:21:06 +00:00
Treehugger Robot
0011f62146 Merge "Add SatelliteClient to the product packages" into main 2024-01-26 14:37:19 +00:00
David Dai
37a2484dad Propagate virtual cpufreq related flags to soong
Bug: 322415363
Test: builds
Change-Id: If7149d69946da636186fa69e2e092c758d6c8671
Signed-off-by: David Dai <davidai@google.com>
2024-01-25 18:42:58 -08:00
LaMont Jones
04172f2e17 Merge "base_rules: Separate aconfig and module_info code" into main am: 0f0c6636ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2915007

Change-Id: I073414239c984d4614a989d9508b297332e16334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 23:12:45 +00:00
LaMont Jones
0f0c6636ec Merge "base_rules: Separate aconfig and module_info code" into main 2024-01-25 22:39:13 +00:00
Sooraj Sasindran
9188610bf8 Add SatelliteClient to the product packages
Add SatelliteClient to the product packages

Bug: 321776764
Change-Id: I9b7ff79b1bfe234511548385dbc6318cfa35ed68
Test: make
2024-01-25 22:30:38 +00:00
Zhi Dou
4a29d17d3e Merge "aconfig: add isOptimizationEnabled in FakeFeatureFlagsImpl" into main am: d09505cc62
Original change: https://android-review.googlesource.com/c/platform/build/+/2925520

Change-Id: I4c960a1d63569354de27682c4fbd0a18186253a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 19:33:01 +00:00
LaMont Jones
89d97bf901 base_rules: Separate aconfig and module_info code
Record LOCAL_ACONFIG_FILES when LOCAL_SOONG_MODULE_INFO_JSON is defined.

Bug: b/308625757
Test: out/soong/module-info-${TARGET_PRODUCT}.json is unchanged
Test: fixes some aconfig flags.
Change-Id: I7ca9d2723e38ec5588bc6ada8769320a0b63bcb5
2024-01-25 19:15:09 +00:00
Zhi Dou
d09505cc62 Merge "aconfig: add isOptimizationEnabled in FakeFeatureFlagsImpl" into main 2024-01-25 18:54:40 +00:00
Jiakai Zhang
2410550e78 Merge "Force PRODUCT_ENABLE_UFFD_GC to true on GSI." into main am: b9627ac3cc
Original change: https://android-review.googlesource.com/c/platform/build/+/2922605

Change-Id: I9ad6f0789124fbf589eafbe66e721d505a16c9ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 18:28:33 +00:00
Jiakai Zhang
b9627ac3cc Merge "Force PRODUCT_ENABLE_UFFD_GC to true on GSI." into main 2024-01-25 17:35:20 +00:00
Dennis Shen
a4294b0c6a aconfig: create unit test targets for aconfig_protos and
aconfig_storage_file crate

also added a bunch of comments to satisfy android lint requirements

Bug: b/321077378
Test: atest aconfig.test, atest aconfig_protos.test, atest aconfig_storage_files.test
Change-Id: I9bce302ac3bc98c5347e5334d915e77337ee89c4
2024-01-25 17:33:36 +00:00