Treehugger Robot
38c3d9ca60
Merge changes from topic "aconfig-improve-dump-formats" into main am: 08cb169cbe
am: b34658e2cb
am: 6887c24bf9
am: 3b4a14bc82
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2666957
Change-Id: Ifb02cc4bb91343143e2ecefafb30e6380daa01e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 15:23:25 +00:00
Treehugger Robot
e09c959f97
Merge "aconfig: fix broken auto-generated Rust code" into main am: 9726e805b3
am: 5c2a6b4c79
am: 72a31fb331
am: 880923696d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2664937
Change-Id: I0112fc7f1af4046432c07a6b0e7114f9338cc2e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 15:22:15 +00:00
Treehugger Robot
3b4a14bc82
Merge changes from topic "aconfig-improve-dump-formats" into main am: 08cb169cbe
am: b34658e2cb
am: 6887c24bf9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2666957
Change-Id: I87927c1b90c3a66a4ba42b7d11c8a92214627e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 14:38:06 +00:00
Treehugger Robot
880923696d
Merge "aconfig: fix broken auto-generated Rust code" into main am: 9726e805b3
am: 5c2a6b4c79
am: 72a31fb331
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2664937
Change-Id: I6c8947b0bf4ab2cd6fef6db95d227b77d4cf73c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 14:37:13 +00:00
Treehugger Robot
6887c24bf9
Merge changes from topic "aconfig-improve-dump-formats" into main am: 08cb169cbe
am: b34658e2cb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2666957
Change-Id: I00393047fdb95d0f73e951db487bf09167e6545e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 13:53:43 +00:00
Treehugger Robot
72a31fb331
Merge "aconfig: fix broken auto-generated Rust code" into main am: 9726e805b3
am: 5c2a6b4c79
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2664937
Change-Id: I8a990c74ec5a92b7f20bc00b4a48cfd5594bf393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 13:53:03 +00:00
Treehugger Robot
b34658e2cb
Merge changes from topic "aconfig-improve-dump-formats" into main am: 08cb169cbe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2666957
Change-Id: I161e7f7f00f0df4666e425ceef47643463322b65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 13:11:32 +00:00
Treehugger Robot
5c2a6b4c79
Merge "aconfig: fix broken auto-generated Rust code" into main am: 9726e805b3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2664937
Change-Id: I36e0e6a0fc387105d6e278b3ab123b2787934e33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 13:10:59 +00:00
Treehugger Robot
08cb169cbe
Merge changes from topic "aconfig-improve-dump-formats" into main
...
* changes:
aconfig: add 'verbose' dump format
aconfig: improve the 'text' dump format
aconfig: remove the 'debug' dump format
2023-07-20 12:35:57 +00:00
Treehugger Robot
9726e805b3
Merge "aconfig: fix broken auto-generated Rust code" into main
2023-07-20 12:32:57 +00:00
Mårten Kongstad
2d5309cab1
aconfig: fix broken auto-generated Rust code
...
Fix syntax error in auto-generated Rust code that prevents the code from
compiling.
For reference, the error was:
---- 8< ----
error: expected `where`, `{`, `(`, or `;` after struct name, found keyword `impl`
--> .../src/lib.rs:6:1
|
6 | impl FlagProvider {
| ^^^^ expected `where`, `{`, `(`, or `;` after struct name
---- >8 ----
Bug: 292052163
Test: manual: create sample based on auto-generated Rust lib
Change-Id: I4c029c0ee16ea3849e7bbe381717a10402c9cb81
2023-07-20 11:33:19 +02:00
Mårten Kongstad
7b6d6b34e5
Merge "Aconfig: sort the parsed flag order in create-cache" into main am: 9c3502d4b4
am: dbdc5d2265
am: 76275e213e
am: e48b738a84
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2665656
Change-Id: I14549291e8bbf47512217db5d24f2517a11a1002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 09:31:24 +00:00
Mårten Kongstad
ea4981407b
aconfig: add 'verbose' dump format
...
Add a new --format=verbose dump output format. This is identical to the
default 'text' format but includes the source files from which the flag
declaration and values were read, and is intended to help debug why a
flag isn't set to some expected value.
Bug: 283910447
Test: atest aconfig.test
Test: printflags --format=verbose # manually inspect output
Change-Id: I03a1c8d940e7a0c6f91e986c5bafa4aa6cd1125a
2023-07-20 11:07:35 +02:00
Mårten Kongstad
e48b738a84
Merge "Aconfig: sort the parsed flag order in create-cache" into main am: 9c3502d4b4
am: dbdc5d2265
am: 76275e213e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2665656
Change-Id: I5e81c4ab0927eca85ddcf32441bb779fb5ba26ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 08:51:01 +00:00
Mårten Kongstad
76275e213e
Merge "Aconfig: sort the parsed flag order in create-cache" into main am: 9c3502d4b4
am: dbdc5d2265
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2665656
Change-Id: I177f1be6fd2bfaee467596f0e0c720c5a4660fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 08:05:41 +00:00
Mårten Kongstad
3fa2f078ff
aconfig: improve the 'text' dump format
...
Standardize the flag values as '<permission> + <state>', e.g.
'READ_ONLY + ENABLED'.
Bug: 283910447
Test: atest aconfig.test
Test: printflags # manually inspect output
Change-Id: I60f74196816327613bd8165a688f8b36da5bdac7
2023-07-20 09:35:05 +02:00
Mårten Kongstad
dbdc5d2265
Merge "Aconfig: sort the parsed flag order in create-cache" into main am: 9c3502d4b4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2665656
Change-Id: I2a2265965232caf189eb3b4a2efb0db4258598ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 07:26:15 +00:00
Mårten Kongstad
9338007cff
aconfig: remove the 'debug' dump format
...
The --format=debug dump output format is largely superseded by the
textproto format now that aconfig doesn't use hand-written wrappers
around the auto-generated proto struct anymore. Remove the format to
reduce the risk of code rot.
Bug: 283910447
Test: atest aconfig.test
Change-Id: I6700fc4eafd3fa3a63952109c0105d34c7ffd98b
2023-07-20 09:25:56 +02:00
Mårten Kongstad
9c3502d4b4
Merge "Aconfig: sort the parsed flag order in create-cache" into main
2023-07-20 06:35:02 +00:00
Zhi Dou
92cf0ec232
Aconfig: sort the parsed flag order in create-cache
...
This change will sorted the parsed flags from the declarations. Without
this change the code will expect the passed in declarations sorted.
After this change the code will still guarantee the parsed flags in the
cache is sorted, but it won't expect the passed in declarations are
sorted
Test: atest aconfig.test
Bug: 291926035
Change-Id: I5f0637fe770003224b128591890e04277bc09345
2023-07-20 02:32:00 +00:00
Daniel Zheng
4a567e0ae2
Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main am: 0ee11559f9
am: 2ad23ca508
am: cfa62e366c
am: 332b8a5643
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2646274
Change-Id: I5fef95769bbdf61f10f2a09c81ad3176a2866f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 19:54:38 +00:00
Daniel Zheng
332b8a5643
Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main am: 0ee11559f9
am: 2ad23ca508
am: cfa62e366c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2646274
Change-Id: I98ac70ff01803840273ce50fa6987ebbb7bae451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 18:26:00 +00:00
Daniel Zheng
cfa62e366c
Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main am: 0ee11559f9
am: 2ad23ca508
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2646274
Change-Id: I0c900faed64028540fede0b2c1f963ab9ca88ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 17:41:33 +00:00
Daniel Zheng
2ad23ca508
Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main am: 0ee11559f9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2646274
Change-Id: Icaf55a978175f82f98684ee929a2153e9cc8e13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 16:39:24 +00:00
Daniel Zheng
0ee11559f9
Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main
2023-07-19 15:57:45 +00:00
Kangping Dong
7ed4bac356
Merge "add service-threadnetwork to system_server jars" into main am: 693afdca74
am: a3ecbf45ff
am: 2927114277
am: c9761ba941
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2651500
Change-Id: I675cb9b3255afca7475e3649ce67d31a735176f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 12:57:28 +00:00
Kangping Dong
c9761ba941
Merge "add service-threadnetwork to system_server jars" into main am: 693afdca74
am: a3ecbf45ff
am: 2927114277
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2651500
Change-Id: Id3cc42d7621993a0265820e166c383655a0da61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 11:48:42 +00:00
Kangping Dong
2927114277
Merge "add service-threadnetwork to system_server jars" into main am: 693afdca74
am: a3ecbf45ff
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2651500
Change-Id: If9847ed876df7f4ef1a001aba354390ea12854b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 11:03:21 +00:00
Kangping Dong
a3ecbf45ff
Merge "add service-threadnetwork to system_server jars" into main am: 693afdca74
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2651500
Change-Id: I249d75a2d80526800a56c3198fc3cdb952c7d836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 10:23:01 +00:00
Kangping Dong
693afdca74
Merge "add service-threadnetwork to system_server jars" into main
2023-07-19 09:40:46 +00:00
Treehugger Robot
248086e4e7
Merge "Add a new variable for deprecating VNDK" into main am: 3ca44b286e
am: 87f21f19f6
am: 888580e57d
am: 871f284558
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2648185
Change-Id: Ia1aac03ca0acf315cb3416f896d2d6d1d3b9d6ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 07:22:05 +00:00
Timothy Yiu
b71494330f
Merge "Conditionally remove DSU for wearable targets" into main am: e97b271350
am: 5cd4465e5b
am: de6b4abf85
am: dc72516b93
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2657595
Change-Id: Ifaa2b4eda8dac6f7ea7c351ac85a69667808896b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 07:21:49 +00:00
Treehugger Robot
871f284558
Merge "Add a new variable for deprecating VNDK" into main am: 3ca44b286e
am: 87f21f19f6
am: 888580e57d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2648185
Change-Id: Ic33096597e970205da93176f99f426030113a4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 06:37:18 +00:00
Timothy Yiu
dc72516b93
Merge "Conditionally remove DSU for wearable targets" into main am: e97b271350
am: 5cd4465e5b
am: de6b4abf85
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2657595
Change-Id: Ifb41e5888f540aa5e72f5fe93a7e00912bd9570c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 06:37:00 +00:00
Treehugger Robot
888580e57d
Merge "Add a new variable for deprecating VNDK" into main am: 3ca44b286e
am: 87f21f19f6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2648185
Change-Id: I24a52822c4ace63dc4a9795c4bdc5a2247cc050f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 06:12:41 +00:00
Timothy Yiu
de6b4abf85
Merge "Conditionally remove DSU for wearable targets" into main am: e97b271350
am: 5cd4465e5b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2657595
Change-Id: Ie58334b351dbf57cf6d5a86dd574aa818cd63841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 06:12:25 +00:00
Treehugger Robot
87f21f19f6
Merge "Add a new variable for deprecating VNDK" into main am: 3ca44b286e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2648185
Change-Id: I65c40754728abf4dd91dfe0cb530011c4944dde7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 05:30:53 +00:00
Timothy Yiu
5cd4465e5b
Merge "Conditionally remove DSU for wearable targets" into main am: e97b271350
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2657595
Change-Id: I714c74bda7b0e13313873a5b76332d11e42e4cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 05:30:21 +00:00
Treehugger Robot
3ca44b286e
Merge "Add a new variable for deprecating VNDK" into main
2023-07-19 04:44:51 +00:00
Timothy Yiu
e97b271350
Merge "Conditionally remove DSU for wearable targets" into main
2023-07-19 04:04:21 +00:00
tyiu
741227c432
Conditionally remove DSU for wearable targets
...
Bug: 289629075
Test: m + Treehugger
Change-Id: Idcf862ee728d81b37ee6a37eb4001969102e250f
2023-07-18 23:59:13 +00:00
Dennis Shen
f89686a3e2
Merge "aconfig: Rust codegen 2nd iteration" into main am: dca368be45
am: 83ec2fc8a6
am: da94a6cf48
am: d0ea6dbbe7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2660115
Change-Id: I07d438b070e79b919a12fa4a7611f7c3e61eb57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 23:22:29 +00:00
Dennis Shen
d0ea6dbbe7
Merge "aconfig: Rust codegen 2nd iteration" into main am: dca368be45
am: 83ec2fc8a6
am: da94a6cf48
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2660115
Change-Id: I44f99a06ee8bda00a9f9d03b44f9922644a70c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 22:37:38 +00:00
Dennis Shen
da94a6cf48
Merge "aconfig: Rust codegen 2nd iteration" into main am: dca368be45
am: 83ec2fc8a6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2660115
Change-Id: Ia271de0bb9f4be0765db89db83d0c652ad0f1f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 21:49:49 +00:00
Dennis Shen
83ec2fc8a6
Merge "aconfig: Rust codegen 2nd iteration" into main am: dca368be45
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2660115
Change-Id: Ie15bab903a5bf94d0dc4354a163fd325a3b7030f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 21:05:45 +00:00
Dennis Shen
dca368be45
Merge "aconfig: Rust codegen 2nd iteration" into main
2023-07-18 20:14:51 +00:00
Dennis Shen
3cfbcf5384
aconfig: Rust codegen 2nd iteration
...
Introduce rust codegen 2nd iteration with unit test support. The design
is described in detail in the design doc (go/aconfig_rust_codegen). The general idea is to generate
different code with the same signature for production and test build
targets, just like java/c/cpp codegen.
We will have a FlagProvider struct that has flag methods implementation.
This flag provider instance can then be used in injection pattern. In
additon, we also generate top level functions that wraps around flag
provider call so it can be used in static function style.
Things to be decided later:
should we just generate one set of code, and use cfg! as compile
time marco to compile the right code for the right targets.
Bug: b/279483360
Test: atest aconfig.test
Change-Id: Ic75cedbd0d27b5242014c3ac7fc80692d2ab4589
2023-07-18 20:14:46 +00:00
Bassem Khalife
113dd0affe
[automerger skipped] Update Security String to 2023-09-01 am: e226175ddf
am: 2498932031
am: 15372f5484
am: 4cb6b4b51c
-s ours am: 069010a828
-s ours am: 26d88c4845
-s ours am: a2305b6951
-s ours am: f05dc5d58e
-s ours am: e9210444d7
-s ours am: 1590365f74
-s ours am: b6819a03ea
-s ours
...
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 f777dbc79f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24033092
Change-Id: Ia30daf96fe9ce7a2d248b1fe6094452e10bf5059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 13:03:15 +00:00
Bassem Khalife
4238513a92
[automerger skipped] Update Security String to 2023-09-01 am: f777dbc79f
am: d7d84ea9a5
am: 27b018b7c7
-s ours am: 2016bb9514
-s ours am: e7cda4163c
-s ours am: 3c51985ea4
-s ours am: 2b41644fb6
-s ours
...
am skip reason: skipped by user bkhalife
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24066547
Change-Id: I5bacc8207abea112735fba2bf870941596144b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 13:03:06 +00:00
Bassem Khalife
af3cc57a56
[automerger skipped] Update Security String to 2023-09-01 am: e226175ddf
am: 2498932031
am: 15372f5484
am: 4cb6b4b51c
-s ours am: 069010a828
-s ours am: 26d88c4845
-s ours am: a2305b6951
-s ours am: f05dc5d58e
-s ours am: e9210444d7
-s ours am: 2fb07747f6
-s ours am: 70d8cd5b2e
-s ours
...
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 f777dbc79f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24033092
Change-Id: I81df000e5aa5933e79e74559f793631ae942750a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 13:02:57 +00:00