Commit Graph

92849 Commits

Author SHA1 Message Date
Dan Shi
e8519a7bad Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main 2023-12-13 19:19:16 +00:00
Dan Shi
16490d3207 Revert "Allow to override fastboot-info.txt for specific board"
Revert submission 2871156-fastboot_info

Reason for revert: possble cause of b/315866782

Reverted changes: /q/submissionid:2871156-fastboot_info

Change-Id: I07baf20bd50529a36f2841350a24ba58d480f5e2
2023-12-13 18:58:49 +00:00
Dmitrii Merkurev
aaf82ff626 Merge "Allow to override fastboot-info.txt for specific board" into main 2023-12-13 02:56:12 +00:00
Dennis Shen
728fe988d8 Merge "aconfig: add create storage command" into main 2023-12-12 23:15:59 +00:00
Dmitrii Merkurev
21eeb06291 Allow to override fastboot-info.txt for specific board
Introduce TARGET_BOARD_FASTBOOT_INFO_FILE to override
fastboot-info.txt generated by default

Test: locally with CF target on related change
Bug: 315811289
Change-Id: I52208e49ac1dfe8558849be9befa60df805665e3
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
2023-12-12 22:10:32 +00:00
Dennis Shen
0d1c5629f7 aconfig: add create storage command
Add a new aconfig command called create-storage which takes a number
of aconfig cache files that belong to a specific container and produces
storage files.

Add a new module called storage (src/storage/mod.rs) as the entry point
of storage files generation. FlagPackage struct is defined as an
intermediate data structure that will be used to drive all storage files creation.

Add a unit test to lock down FlagPackage creation behaviors.

Bug: b/312243587
Test: atest aconfig.test

Change-Id: Ia7e9f68237ea903f295ac7891c923f6a39f3422d
2023-12-12 21:46:57 +00:00
Ted Bauer
a27d46c590 Merge "aconfig: fix template bug in exported mode." into main 2023-12-12 20:47:19 +00:00
Julie Pan
6fd71de5a1 Merge "Remove lberki@google.com from OWNERS" into main 2023-12-12 19:48:16 +00:00
Ted Bauer
98562fded9 aconfig: fix template bug in exported mode.
FakeFeatureFlagsImpl still generated all flags in its mFlagMap field, but it should generate only exported flags in exported mode.

Test: atest aconfig.test.java
Bug: 311152507
Change-Id: I61843cd87b3bb5035772791a5869a91b07d574d8
2023-12-12 14:42:45 -05:00
Treehugger Robot
4f3ea9eeb8 Merge "Support overriding cow version during OTA generation" into main 2023-12-12 18:38:29 +00:00
Treehugger Robot
83bc504d74 Merge "aconfig: include all tests in TEST_MAPPING" into main 2023-12-12 14:07:43 +00:00
Mårten Kongstad
0ae74f86ba aconfig: include all tests in TEST_MAPPING
The aconfig tests used to be implicitly run by Treehugger, but something
has changed and Treehugger no longer verifies aconfig uploads. Fix this
by explicitly listing all aconfig tests in the TEST_MAPPING file.

Treehugger does not allow new tests in presubmit before they have proven
themselves (in terms of flakiness and execution speed) in postsubmit.
For this reason this CL adds the tests to postsubmit; a follow-up CL
will move them to presubmit.

This has the added benefit of allowing developers to easily run all
tests locally, either by

  $ atest

if current working directory is build/tools/aconfig or one of its
subdirectories, or

  $ atest --test-mapping $(gettop)/build/tools/aconfig

from anywhere in the Android tree.

Also add all tests to "general-tests" to enable Treehugger to run them.
Move aconfig.test from "device-tests" to "general-tests"; the former
group is intended for tests that depend on device-specific
functionality. See [1] for more info.

1. https://source.android.com/docs/core/tests/development/test-mapping

Bug: N/A
Test: atest --test-mapping $(gettop)/build/tools/aconfig
Change-Id: If857733834c8ad43a16e6162e50e6b1f713f979d
2023-12-12 14:05:15 +01:00
Treehugger Robot
d2a333f691 Merge "aconfig: fix broken test 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'" into main 2023-12-12 12:43:00 +00:00
Mårten Kongstad
0bedc1507d aconfig: fix broken test 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'
The aconfig.test.cpp.test_mode test cases modify the local flag
overrides, but was not resetting the values between tests. This meant
that

  $ atest 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'

would succeed, but

  $ atest aconfig.test.cpp.test_mode

would fail. Fix this by calling reset_flags() as part of the per-test
setup.

Bug: N/A
Test: atest aconfig.test.cpp.test_mode
Change-Id: Ic8cffff0deb279b7ae103c05642c67230afc040f
2023-12-12 10:29:58 +01:00
Wei Li
35baf405e0 Merge "Fix the function invocation which missed the package name." into main 2023-12-11 21:45:23 +00:00
Wei Li
b32ad827c7 Fix the function invocation which missed the package name.
The issue was introduced in the last refactoring, but the logic using the function is currently not used so nothing is broken.

Bug: 303904827
Test: CIs
Change-Id: I428e5b8d525ec49d0d5f62b7fbcc54caf482ac59
2023-12-11 12:19:30 -08:00
Oriol Prieto Gascó
13af7616bf Merge "aconfig: Respect flag naming convention on test flags" into main 2023-12-11 18:45:37 +00:00
Oriol Prieto Gasco
bbeda85949 aconfig: Respect flag naming convention on test flags
Test: atest aconfig.test
Bug: 311152507
Change-Id: I960867d32415007db5dacab57e97b813cbbee650
2023-12-11 18:45:06 +00:00
Dennis Shen
97ae9d35de Merge "aconfig: update aconfig cpp integration tests" into main 2023-12-11 16:50:03 +00:00
Dennis Shen
813267d1e7 aconfig: update aconfig cpp integration tests
Note a new cc_test target aconfig.test.cpp.test_mode is added instead of
reusing the old aconfig.test.cpp test target is becuase the test and
production version codegen flag lib has symbol conflict, one should only
link one at a a time.

Bug: b/291068147
Test: atest aconfig.test.cpp/aconfig.test.cpp.test_mode
Change-Id: Ifd52fd6eb7538fba90a13f0a6618a33a69b2358e
2023-12-11 13:20:12 +00:00
George Lin
7c607a0e32 Merge "Revert "Fix the KNOWN_CODENAMES to include "L"."" into main 2023-12-09 00:13:57 +00:00
Xin Li
4e1043bfde Merge "Merge Android 14 QPR1" into main 2023-12-09 00:11:53 +00:00
George Lin
b30e25376f Revert "Fix the KNOWN_CODENAMES to include "L"."
This reverts commit c4517b0fbd.

Reason for revert: The CL is considered a culprit of b/315384164

Change-Id: I47479cad38f2337e68e14a5e31bd9bc26d948b94
2023-12-08 21:45:17 +00:00
Xin Li
8b3a0e9ec4 Merge Android 14 QPR1
Merged-In: I3810ff367d86e26e3a29210caa248867cca31cf0
Bug: 315507370
Change-Id: Ie16a18d43d04b55670bab2c9a0979a2696ed201a
2023-12-08 13:13:06 -08:00
Dennis Shen
c64fa2e2c6 Merge "aconfig: update aconfig owners" into main am: 60eeb8578b
Original change: https://android-review.googlesource.com/c/platform/build/+/2863158

Change-Id: I3810ff367d86e26e3a29210caa248867cca31cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 19:50:57 +00:00
Dennis Shen
60eeb8578b Merge "aconfig: update aconfig owners" into main 2023-12-08 19:16:00 +00:00
Dennis Shen
102bec338a aconfig: update aconfig owners
Change-Id: Ie97963c68c789e64495db4ed6e198f17eab412f6
2023-12-08 19:14:17 +00:00
Treehugger Robot
7c9c3c00ce Merge "aconfig: move codegen into separate module" into main am: a18d7b17b7
Original change: https://android-review.googlesource.com/c/platform/build/+/2863041

Change-Id: Id17e69e5565065184b9a173d6b9502de6df724df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 14:51:47 +00:00
Treehugger Robot
a18d7b17b7 Merge "aconfig: move codegen into separate module" into main 2023-12-08 14:15:51 +00:00
Treehugger Robot
a57772e2b8 Merge "aconfig: consolidate how fully qualified flag name is calculated" into main am: 5f24a2095d
Original change: https://android-review.googlesource.com/c/platform/build/+/2864525

Change-Id: I8d4bfa54fada04c011a0d08455a751cf88d1f1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 12:08:09 +00:00
Treehugger Robot
5f24a2095d Merge "aconfig: consolidate how fully qualified flag name is calculated" into main 2023-12-08 11:22:50 +00:00
Jihoon Kang
3d25718707 Merge "Add new dump format map in aconfig" into main am: 14a82dab15
Original change: https://android-review.googlesource.com/c/platform/build/+/2860210

Change-Id: Id5c08096557747bbb0e491f32afbe3cacfd995d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 10:27:20 +00:00
Mårten Kongstad
12e593cd02 aconfig: move codegen into separate module
Consolidate the code generation sources into its own module. This is
done in preparation for when support for the new flag storage will be
added, which should also be placed in a separate module.

Bug: N/A
Test: atest aconfig.test aconfig.test.java
Change-Id: I8246729218ec60f2af4568c460e98329665a89fa
2023-12-08 11:24:54 +01:00
Mårten Kongstad
f3f20efd0c aconfig: consolidate how fully qualified flag name is calculated
Add an extension trait to consolidate how the fully qualified package
name (<package>.<name>) is calculated and use this where possible.

This CL is a semantic change only. The intention of this CL is to reduce
the risk of future bugs.

Bug: N/A
Test: atest aconfig.test
Change-Id: Ibab6641dda3843337fbea02631c31a1fdd8fb4ab
2023-12-08 11:02:32 +01:00
Jihoon Kang
14a82dab15 Merge "Add new dump format map in aconfig" into main 2023-12-08 09:48:13 +00:00
Hansen Kurli
3bdc58adee Merge "Remove racoon, mtpd, pppd, ip-up-vpn" into main am: f388a25f97
Original change: https://android-review.googlesource.com/c/platform/build/+/2864095

Change-Id: I9fa434f2b12917677ad298cf4fce071efdb436a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 09:21:57 +00:00
Hansen Kurli
f388a25f97 Merge "Remove racoon, mtpd, pppd, ip-up-vpn" into main 2023-12-08 08:52:16 +00:00
Xin Li
3c3bec8910 Skip UQ1A.231205.015
Bug: 308969284
Merged-In: I1236f2a84e1b6fce4bc27d366006d7bbac69ab50
Change-Id: I3e16ed3a8f34935aaf377234072b7c174ece7e69
2023-12-07 15:49:24 -08:00
Treehugger Robot
428953becb Merge "Fix the KNOWN_CODENAMES to include "L"." into main am: d4a39894ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2865065

Change-Id: I1236f2a84e1b6fce4bc27d366006d7bbac69ab50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 22:54:08 +00:00
Treehugger Robot
d4a39894ca Merge "Fix the KNOWN_CODENAMES to include "L"." into main 2023-12-07 22:47:29 +00:00
Colin Cross
6e838663c3 Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main am: 2118e738b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2861369

Change-Id: Ie532c29ad682051650598340a7452efda10f4e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 22:37:13 +00:00
Jihoon Kang
a95f2b230c Add new dump format map in aconfig
The `aconfig dump --format map` lists aconfig keys mapped to its boolean
values that represents whether the flag is enabled or not, as seen below:
```
flag.name1=true
flag.name2=false
```

Test: aconfig dump --format map --cache out/soong/.intermediates/build/make/tools/aconfig/aconfig.test.flags/intermediate.pb && inspect output
Bug: 306024510
Change-Id: Ic4990c168f6fa9c87869113ba695c07394adbc67
2023-12-07 22:36:59 +00:00
Colin Cross
2118e738b2 Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main 2023-12-07 21:56:31 +00:00
Kelvin Zhang
8793a72bfd Support overriding cow version during OTA generation
Added a --vabc_cow_version flag to override cow version.
This enables testing on COW v3 without switching the android platform to
v3.

Test: th
Bug: 313962438
Change-Id: I9ff3ae6b6c7c8ef8c1423af6f25e420f94558d35
2023-12-07 13:20:43 -08:00
Jeff Hamilton
c4517b0fbd Fix the KNOWN_CODENAMES to include "L".
Bug: 307733231
Test: atest CtsOsTestCases:android.os.cts.BuildTest
Change-Id: Ie648f241d3d2deb5de2b937916df7ce3d7d15014
2023-12-07 19:44:17 +00:00
Micha Schwab
067bb6643d Merge "Add metadata to aconfig" into main am: 56835092e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2851033

Change-Id: I737e31f91270ed5e3ba2721788fbb3237c51175b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 16:55:10 +00:00
Micha Schwab
56835092e4 Merge "Add metadata to aconfig" into main 2023-12-07 15:55:18 +00:00
Hansen Kurli
fa92526d35 Remove racoon, mtpd, pppd, ip-up-vpn
Legacy VPN types are removed. These are now unused.

Bug: 161776767
Test: m
Change-Id: I2ccc10d9c8680a6de9160e07e726312bc7b1fdc9
2023-12-07 19:20:14 +08:00
Treehugger Robot
9b89598e89 Merge "Update create_brick_ota doc" into main am: ed339976c6
Original change: https://android-review.googlesource.com/c/platform/build/+/2863186

Change-Id: I9c5fd1b55ff082c453c52a4b2c7994a5a82e3e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 23:30:40 +00:00
Treehugger Robot
ed339976c6 Merge "Update create_brick_ota doc" into main 2023-12-06 22:12:05 +00:00