Commit Graph

9037 Commits

Author SHA1 Message Date
Micha Schwab
1a1a08a378 Add metadata to aconfig
Flag metadata will be used both for release strategy, such as allowing faster rollouts for flags, and for test infrastructure such as which platform tests need running.

Doc: go/aconfig-metadata
Test: atest aconfig.test
Change-Id: Idc4b1c6b03c257a1cf92afdfb0b6e54b43741b06
2023-12-05 17:22:19 -05:00
Treehugger Robot
ca96bcb0c8 Merge "Sign OTA packages inside target_files during signing" into main 2023-12-05 21:46:55 +00:00
Colin Cross
aa8ab36c33 Merge "Support aconfig dump --dedup" into main am: 952df85c69 am: b44c99d160 am: ef604024f6
Original change: https://android-review.googlesource.com/c/platform/build/+/2853485

Change-Id: I362d5b283ca14f95bd4d1efa5dfcafdd16ea901b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 21:43:25 +00:00
Colin Cross
952df85c69 Merge "Support aconfig dump --dedup" into main 2023-12-05 19:12:11 +00:00
Aditya Choudhary
d96041a0c6 Code metadata integration with Generator tool
Change-Id: Icf14b48bc777207ac7cc7a287a174c8de817339b
2023-12-05 18:10:25 +00:00
Oriol Prieto Gascó
3b0e8fd67a Merge "Add container field to flag_declarations" into main am: 6344fdf9a6 am: 073e0b798f am: b8ab3aa4cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2843433

Change-Id: Icb66400eb8fada4597f251d2e3719ad3cf9fc06e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 14:01:10 +00:00
Oriol Prieto Gascó
6344fdf9a6 Merge "Add container field to flag_declarations" into main 2023-12-05 11:46:43 +00:00
Yi-Yo Chiang
0ca4aaba2f Merge "releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" into main am: 7a519aebde am: 690fdfd597 am: 0b258a3037
Original change: https://android-review.googlesource.com/c/platform/build/+/2855526

Change-Id: Ia31cc85a0587d989054d1dc6ff51c9a9aec092d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:15:16 +00:00
Yi-Yo Chiang
7a519aebde Merge "releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" into main 2023-12-05 03:29:42 +00:00
Oriol Prieto Gasco
7afc7e7b1c Add container field to flag_declarations
A container is software which is always built in its entirety using the
same build environment. In particular, all of its parts are built using
the same build-time default flag values. In addition, containers are
always installed as a single unit.

Bug: 312696545
Test: atest aconfig.test && m all_aconfig_declarations
Change-Id: I2ef3db836c4456f4f4fb5c066edf9094e38f89cc
2023-12-05 02:25:01 +00:00
Treehugger Robot
53477c86e0 Merge "Add the next release to Class2NonSdkList." into main am: 2f9162f1cb am: 0ecfef4423 am: efe2a3408d
Original change: https://android-review.googlesource.com/c/platform/build/+/2858125

Change-Id: I52fae823f4c3e22f507123c188923a5b56d2725b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 02:18:32 +00:00
Alex Buynytskyy
48d64b886a Add the next release to Class2NonSdkList.
Fixes: 313893203
Test: step-1
Change-Id: I0f6ae822cd206df23a2ffd1dade78bb430006c5d
2023-12-04 23:15:43 +00:00
Treehugger Robot
2cd3109af1 Merge "Revert "releasetools: Deprecate GKI build rules"" into main am: e5bfa38457 am: ceabadb916 am: 33a42856c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2854392

Change-Id: I0e62faf20de1cd9bdaaba6df561658271718a0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 10:24:02 +00:00
Yi-Yo Chiang
18650c7be0 releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE
This variable is always false or empty now, so clean up remaining
references to the variable.

Bug: 241346584
Test: Presubmit
Change-Id: I5dd3d356729d0bd2639633580bbb85f8b03582cf
2023-12-01 09:03:08 +00:00
Treehugger Robot
e5bfa38457 Merge "Revert "releasetools: Deprecate GKI build rules"" into main 2023-12-01 08:18:40 +00:00
Yi-Yo Chiang
92a517d75e Revert "releasetools: Deprecate GKI build rules"
This reverts commit faaede0f01.

Reason for revert: caused GSI sign failure b/311134118#comment23

Change-Id: Id794a8ab3369c907834a73cc88ea1640dc7492d1
2023-12-01 07:02:17 +00:00
Treehugger Robot
9c6515f8a1 Merge "Remove non-functional check owners script that pre-dated gerrit." into main am: 45db0e0c17 am: aa17389511 am: 58bf38473c
Original change: https://android-review.googlesource.com/c/platform/build/+/2852287

Change-Id: I4c60484d62893f491f2b03475f03685418d14f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 04:05:54 +00:00
Sam Saccone
452b4fd805 Remove non-functional check owners script that pre-dated gerrit.
The gerrit team has now official ways of validating owner files
https://android-review.googlesource.com/plugins/code-owners/Documentation/validation.html

BUG=312931985

Change-Id: Iafce62560bdd080cafb419af68acf24d86cdfc78
2023-12-01 00:45:05 +00:00
Daniel Rosenberg
71dc8825e0 Merge "Add support for different F2FS block sizes" into main am: 5514a5aaf6 am: 53661d57b2 am: 2c67335b45
Original change: https://android-review.googlesource.com/c/platform/build/+/2835796

Change-Id: Icf06290f0f9d86b6c9343437806bfa5aa0e8f74a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 02:02:07 +00:00
Daniel Rosenberg
5514a5aaf6 Merge "Add support for different F2FS block sizes" into main 2023-11-30 00:24:46 +00:00
Colin Cross
6befb342fd Support aconfig dump --dedup
Add a flag to aconfig dump that will allow identical flags to be merged
without erroring.  This will allow merging the aconfig cache files from
dependencies for each module, which requires passing less data to Make
from Soong, and thus reduces the percentage of builds require Kati
analysis.

Bug: 313698230
Test: aconfig.test
Change-Id: Id2d9b78225720ce01defad4b13ea9395f6ab1033
2023-11-29 12:04:36 -08:00
Ted Bauer
43c2086266 Merge "aconfig: Add exported mode to aconfig Java library generation." into main am: df2b347f9f am: 5169faa366 am: 1cd3dda2e5
Original change: https://android-review.googlesource.com/c/platform/build/+/2848173

Change-Id: I5ae2d060d5196371ddfdd3114aa14f80b7ecc70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 20:03:21 +00:00
Ted Bauer
df2b347f9f Merge "aconfig: Add exported mode to aconfig Java library generation." into main 2023-11-29 18:23:10 +00:00
Ted Bauer
4a6af78b69 aconfig: Add exported mode to aconfig Java library generation.
This commit adds a third codegen mode, _exported_, in addition to
the existing modes, production and test.

When codegen mode is _exported_, getters are generated _only_ for
flags marked as exported as well. Also the getters always look
up DeviceConfig values at runtime, and have a default value of
false.

This only implements exported mode for Java codegen, follow-up CLs
will support Rust and C++.

Test: atest aconfig.test
Bug: 311152507
Change-Id: Ie39379b40de072180e05d84c76361b24cc0e0d83
2023-11-29 15:44:24 +00:00
Dennis Song
3965d39d2a Merge "Expose --avb_resolve_rollback_index_location_conflict" into main am: 4605c0ec76 am: 60046f4d0a am: 0ce2277a45
Original change: https://android-review.googlesource.com/c/platform/build/+/2851825

Change-Id: I86abe3d32e2ba51db6043da9f81badfe699bdf05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 10:29:05 +00:00
Dennis Song
4605c0ec76 Merge "Expose --avb_resolve_rollback_index_location_conflict" into main 2023-11-29 08:54:36 +00:00
Yi-Yo Chiang
c63a85c600 Merge "releasetools: Deprecate GKI build rules" into main am: 6312ff59c1 am: d2064edec9 am: bfeb9f643a
Original change: https://android-review.googlesource.com/c/platform/build/+/2846154

Change-Id: Idf97a64082b53a940030623c297e5a89ee13fd9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 08:34:57 +00:00
Yi-Yo Chiang
6312ff59c1 Merge "releasetools: Deprecate GKI build rules" into main 2023-11-29 06:47:25 +00:00
Dennis Song
79e313972c Expose --avb_resolve_rollback_index_location_conflict
Expose this option at `merge_builds.py` so that this script
can also resolve the conflict AVB rollback index location
while building the vbmeta image.

Bug: 289368551
Test: TreeHugger
Change-Id: I404160ff5d7591cb6a81ed2d2267de1b0e6ac65f
2023-11-29 06:03:44 +00:00
Jooyung Han
d1d65ec245 Merge "Remove APEX from merged target-files package" into main am: 2ee7f71e62 am: eeb92a131f am: 34addf571d
Original change: https://android-review.googlesource.com/c/platform/build/+/2845736

Change-Id: Icd540eab54a7add2b34da08197252b4cd3901818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 04:09:34 +00:00
Po Hu
ce867a65b5 Remove APEX from merged target-files package
It was a temp folder created for check_target_files_vintf.py.
But now it is wrongly archived by create_target_files_archive
in merge_target_files.py.
And then such package will cause CheckVintf exception in
ota_from_target_files.py because the APEX folder is created
again but already exists.
So use MakeTempDir to make it removed after check finished.

Test: merge_target_files & ota_from_target_files
Change-Id: Iab54afff2c346a582d5ee5228103fe091e016cd0
2023-11-29 08:54:44 +08:00
Kelvin Zhang
b84d2aa7d1 Sign OTA packages inside target_files during signing
Test: th
Bug: 293313353
Change-Id: Ifd5dd08153c5970dac8166808173f7dfbbb3411d
2023-11-28 10:08:38 -08:00
Yi-Yo Chiang
faaede0f01 releasetools: Deprecate GKI build rules
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.

Bug: 229701033
Fix: 229701033
Test: presubmit
Change-Id: Ie882fccd864920289e48366e99a4ebd67e784d0d
2023-11-28 08:54:33 +00:00
Daniel Rosenberg
d9a520c5bd Add support for different F2FS block sizes
F2FS has been expanded to allow for different block sizes. Currently the
block size must be the same as page size, but this may change in the
future. This gives support for 16K while not restricting the ability to
choose a block size that isn't based on the page size later on.

Bug: 279820706
Test: Boot 16k F2FS device
Change-Id: I4e025d83a5e5ad03d89bc80b02fea390c2cbad69
2023-11-27 18:09:18 -08:00
Oriol Prieto Gascó
aaef83f898 Merge "Add is_exported field to aconfig.proto" into main am: c96bf2caec am: ddff40facb am: 4fc92eae5c
Original change: https://android-review.googlesource.com/c/platform/build/+/2838715

Change-Id: I71902f895d0700dfcbde080ce6c9aa0b24e5ec27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 14:25:05 +00:00
Oriol Prieto Gascó
c96bf2caec Merge "Add is_exported field to aconfig.proto" into main 2023-11-22 13:41:09 +00:00
Wonsik Kim
d414bb71f9 Merge "aconfig: move cache_ as a memeber" into main am: 8a64367cb5 am: 90f1cbbef4 am: 536dc681f6
Original change: https://android-review.googlesource.com/c/platform/build/+/2835795

Change-Id: I94df047b26341ed16ccfc2e3acb5178d61783d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 19:44:26 +00:00
Aditya Choudhary
c1828c7a53 Merge "Split filepaths on ' ' in metadata generator" into main am: c35ca4de22 am: 2a4fb8417e am: 1614601d09
Original change: https://android-review.googlesource.com/c/platform/build/+/2840735

Change-Id: I6424a49608fb5f80e472ea161f0206c645a25409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 18:02:41 +00:00
Wonsik Kim
8a64367cb5 Merge "aconfig: move cache_ as a memeber" into main 2023-11-21 17:57:39 +00:00
Aditya Choudhary
c35ca4de22 Merge "Split filepaths on ' ' in metadata generator" into main 2023-11-21 16:09:23 +00:00
Aditya Choudhary
93cd9f6791 Split filepaths on ' ' in metadata generator
Test: go test

Change-Id: I5063c5a0b93501010b38aea91e8648cf5960ee6e
2023-11-21 14:02:43 +00:00
Treehugger Robot
c7d8fbd5d0 Merge "Add --boot-image-dir-path arg" into main am: fdd0c0cdde am: 924762e4a9 am: 768e24995e
Original change: https://android-review.googlesource.com/c/platform/build/+/2821038

Change-Id: Iaef52ce2e40756c20a1b087a391c1c24c47ce08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:05:06 +00:00
Treehugger Robot
fdd0c0cdde Merge "Add --boot-image-dir-path arg" into main 2023-11-21 02:09:17 +00:00
Oriol Prieto Gasco
0b9d289e2a Add is_exported field to aconfig.proto
When a flag is exported, it can be read by code built in other containers. By
default flags are not exported. Set this to true if your flag is gating
a public API which may be called from other containers (typically, a
flag used in @FlaggedAPI annotations).

Test: atest aconfig.test
Bug: 311152500
Change-Id: I53e3ed18b96c1518f04172d5933ef96b41ccda7e
2023-11-20 21:30:18 +00:00
Wonsik Kim
d4d952f9d2 aconfig: move cache_ as a memeber
provider_ object relies on cache_ vector to be alive, but the order
of destruction between these objects at exit are not guaranteed.
This can lead to crash at the exit especially on ASAN build.
By putting cache_ as a member it is guaranteed that cache_ is not
destructed until provider_ is destructed.

Test: m ; m AconfigDemoActivity
Test: atest aconfig.test
Test: observe no crash on _hwasan build
Change-Id: If9e23e99c501bf8f06fcab003622948b9e730352
2023-11-20 09:50:52 -08:00
Treehugger Robot
af003888e7 Merge "aconfig: rename test flag disabled_rw_2 -> disabled_rw_in_other_namespace" into main am: 085c016934 am: ec2402da1b am: f998aaf832
Original change: https://android-review.googlesource.com/c/platform/build/+/2836475

Change-Id: I93fe894a2557b652e5cf0b4c1395384f0eba661b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 16:00:27 +00:00
Treehugger Robot
085c016934 Merge "aconfig: rename test flag disabled_rw_2 -> disabled_rw_in_other_namespace" into main 2023-11-17 14:20:25 +00:00
Aditya Choudhary
734aceba2e Merge "Handle empty input file case in Metadata generation" into main am: d5e2717e27 am: 648c965b5c am: 9813035f29
Original change: https://android-review.googlesource.com/c/platform/build/+/2835510

Change-Id: Ibd1c6e42a44d3dbb9fa942be100160964f7291a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 13:48:34 +00:00
Aditya Choudhary
d5e2717e27 Merge "Handle empty input file case in Metadata generation" into main 2023-11-17 12:19:55 +00:00
Mårten Kongstad
bc76a3d9a0 aconfig: rename test flag disabled_rw_2 -> disabled_rw_in_other_namespace
The flag `disabled_rw_2` is used to verify that aconfig can
auto-generate code for flags in different namespaces. Rename the flag to
`disabled_rw_in_other_namespace` to highlight that it belongs to a
different namespace than the other flags.

This CL is a semantic change only.

Bug: None
Test: atest aconfig.test
Change-Id: Ib82fdce0ca3f7cd56b9b3f80e44fe424a03a2ae4
2023-11-17 09:37:06 +01:00