Commit Graph

93109 Commits

Author SHA1 Message Date
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
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
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
e2799f42ef Merge "[Thread] add ot-ctl to userdebug for testing" into main 2024-01-30 07:50:48 +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
1cc902690e Merge "Fix ext4 size estimates" into main 2024-01-29 20:06:18 +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
c4e6b40594 Merge "Remove workaround to copy reclient binaries" into main 2024-01-29 17:21:38 +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
dfb817c223 Merge "aconfig: add aconfig_storage_metadata proto" into main 2024-01-26 20:38:41 +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
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
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
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
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
Zhi Dou
b874ca75e4 aconfig: add isOptimizationEnabled in FakeFeatureFlagsImpl
This change adds isOptimizationEnabled method in FakeFeatureFlagsImpl.
This method can help test to decide whether the code using flag is
optimized.

Bug: 309406391
Test: atest aconfig.test aconfig.test.java
Change-Id: I7e7109ac06ab44f9b8dee56c76be9479f60a9148
2024-01-25 16:07:32 +00:00
Dennis Shen
11529aa52f Merge "aconfig: create aconfig_storage_file crate" into main 2024-01-25 15:28:34 +00:00
Dennis Shen
00f4643347 Merge "update flags.mk to create one storage file per rule" into main 2024-01-25 14:39:21 +00:00
Jiakai Zhang
94c6d7a401 Force PRODUCT_ENABLE_UFFD_GC to true on GSI.
If the kernel version isn't available to the build system and
PRODUCT_ENABLE_UFFD_GC isn't explicitly set, there will be a build
warning. To address the warning and make the behavior more explicit on
GSI builds, we need this change.

Bug: 321751629
Test: lunch aosp_x86_64-trunk_staging-userdebug && m dist
Change-Id: I5b73890235827929ea3bce5a07260d6c67a00a27
2024-01-25 14:37:30 +00:00
Treehugger Robot
e11290c27c Merge "Rename arch variant goldmont-without-xsaves to goldmont-without-sha-xsaves" into main 2024-01-25 08:11:40 +00:00
Treehugger Robot
75d530cbff Merge "Enable clang coverage" into main 2024-01-25 06:18:24 +00:00
Yi-Yo Chiang
accdd3f087 Merge "Re-land: releasetools: Deprecate GKI build rules" into main 2024-01-25 05:29:11 +00:00
Yi-Yo Chiang
a4d5f4380b Re-land: releasetools: Deprecate GKI build rules
(Re-land of Ie882fccd864920289e48366e99a4ebd67e784d0d)

We no longer build GKIs from the platform tree.
These build commands were neither used nor maintained anymore, so clean
them up to reduce maintenance effort.
Keep the command line options as no-op, so existing scripts that still
specifies the deprecated options don't break.

Bug: 229701033
Test: presubmit
Change-Id: I0f7d05562dbc3eed29e902d6dc9a0f2e4083aaa6
2024-01-25 11:21:00 +08:00
Kelvin Zhang
158a5ebbc9 Fix ext4 size estimates
Currently, EXT4 image building is done in a 2 pass fashion:

First pass: build ext4 image with small margin/headroom, check the
number of block used in the output image

Second pass: Build ext4 image again with an estimated block count from
first pass

The two pass implementation is done to keep image size at a
minimum. Recently some failures in first pass invocation is observed due
to image being undersized. Since we will reduce the image size in 2nd
pass, it's OK to increase the image size estimate during first pass. Add
a headroom 10% of total file size to fix build failures.

Test: cherry pick r.android.com/q/topic:%22aosp_cf_system_x86_64%22 and
m aosp_cf_system_x86_64

Bug: 321003625
Change-Id: I254310c67a08b98b05d2c858d4ab59a48112a07b
2024-01-24 18:37:27 -08:00
Treehugger Robot
ebb0bd4b81 Merge "Disable Window Extensions on TV" into main 2024-01-25 01:49:01 +00:00
Devin Moore
14d1d0b155 Merge "find_static_candidates.py: protect against missing keys in module" into main 2024-01-24 23:29:34 +00:00
Hongguang Chen
e068028fe7 Disable Window Extensions on TV
Window Extensions is not supported on TV. Adding it to TV GSI causes
some CTS failure.

Bug: 321898211
Test: make TV GSI, check artifacts
Test: atest CtsWindowManagerJetpackTestCases on TV GSI
Change-Id: Ice6602c7b06c2e09e557423426abaa94da55c836
2024-01-24 23:25:46 +00:00
Dennis Shen
cf9a752092 aconfig: create aconfig_storage_file crate
Move aconfig storage file definition into its own crate, as flag read
lib will need it as well. The new crate is placed under
aconfig_storage_file dir.

Bug: b/321077378
Test: atest aconfig.test, Cargo test at repo root level
Change-Id: I91e8ada2c9bab479ed81cf03824042f3fa460be5
2024-01-24 21:33:42 +00:00
Dan Shi
c1e550d515 Support test runnner option in auto generated test configs
Bug: 284179405
Bug: 236980335
Test: unittest
Change-Id: I7f96a2a2bc52316888e87af7e4bcc4ef50863716
2024-01-24 21:12:40 +00:00