StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,296 Commits 1 Branch 0 Tags
c0419c78bfd22020bb689eedbb707b48acf55ec4
Commit Graph

89296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
c0419c78bf Merge "aconfig: restructure integration tests" into main am: dce1fabf80 am: e182021f83 am: 975aac4d8c am: 5718adee88 
Original change: https://android-review.googlesource.com/c/platform/build/+/2672875

Change-Id: I3296af201bd642205b5d1b8a4aa46e441e74524f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-24 16:36:08 +00:00
Treehugger Robot
5718adee88 Merge "aconfig: restructure integration tests" into main am: dce1fabf80 am: e182021f83 am: 975aac4d8c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2672875

Change-Id: I98751451885661387e8c172833573646070cb00a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-24 15:49:16 +00:00
Treehugger Robot
975aac4d8c Merge "aconfig: restructure integration tests" into main am: dce1fabf80 am: e182021f83 
Original change: https://android-review.googlesource.com/c/platform/build/+/2672875

Change-Id: Id0de20622d2d3d97e925fdae8e33f1ddb0022d0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-24 15:05:15 +00:00
Treehugger Robot
e182021f83 Merge "aconfig: restructure integration tests" into main am: dce1fabf80 
Original change: https://android-review.googlesource.com/c/platform/build/+/2672875

Change-Id: I3c9135982ff7ca258a2b9fa52cbd60f655564aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-24 14:22:42 +00:00
Treehugger Robot
dce1fabf80 Merge "aconfig: restructure integration tests" into main 2023-07-24 13:48:28 +00:00
Mårten Kongstad
af3da9d1be aconfig: restructure integration tests 
Consolidate integration tests under tests/. Rename build targets to
follow the same pattern.

The important aconfig build targets are:

  - aconfig           : the aconfig binary
  - aconfig.test      : the aconfig unit tests
  - aconfig.test.java : the Java integration tests
  - aconfig.test.cpp  : the C++ integration tests
  - aconfig.test.rust : the Rust integration tests (not implemented yet)

Note: the Rust integration tests are blocked until the build system has
added support for aconfig Rust libraries.

Note: the flags used in the integration are not set correctly. A
follow-up CL will fix this.

Bug: 283911467
Test: atest aconfig.test.java aconfig.test.cpp
Change-Id: Idb8dad4c38a49231c2e89228775bacf065ee1f57
 2023-07-24 13:05:43 +02:00
Treehugger Robot
5b9b54df18 Merge "Make aconfig c++ generate only one header and only one .cc file" into main am: 289fdf213a am: c943f4c1e5 am: 5815ece200 am: c73041b689 
Original change: https://android-review.googlesource.com/c/platform/build/+/2662943

Change-Id: Ic6972145c518504021fd205d85cca3a8cbf053db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 21:29:36 +00:00
Treehugger Robot
c73041b689 Merge "Make aconfig c++ generate only one header and only one .cc file" into main am: 289fdf213a am: c943f4c1e5 am: 5815ece200 
Original change: https://android-review.googlesource.com/c/platform/build/+/2662943

Change-Id: I7334804f68dafcbfc35ed426283fa1a0aa8f367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 20:43:58 +00:00
Treehugger Robot
5815ece200 Merge "Make aconfig c++ generate only one header and only one .cc file" into main am: 289fdf213a am: c943f4c1e5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2662943

Change-Id: I36b282a8ad6a22c265fa061d914cf6b3601d0a87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 20:02:19 +00:00
Treehugger Robot
c943f4c1e5 Merge "Make aconfig c++ generate only one header and only one .cc file" into main am: 289fdf213a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2662943

Change-Id: Id1e64e2e7f57c24b8620b5684bf47e5d41f09d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 19:16:33 +00:00
Treehugger Robot
289fdf213a Merge "Make aconfig c++ generate only one header and only one .cc file" into main 2023-07-21 19:09:30 +00:00
Treehugger Robot
dd58a8b1cf Merge "Combine aconfig cache files into per-partition dumps." into main am: 21e6105b79 am: a8e2b20b71 am: 0bb978473c am: b2fc359a17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2645008

Change-Id: Ie0e713c499b7153c86c4f8742ed962e7e81a26b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 16:37:07 +00:00
Joe Onorato
ac692c5eae Make aconfig c++ generate only one header and only one .cc file 
Bug: 283479529
Test: m aconfig_hello_world_cc && adb push $TOP/out/target/product/panther/system/bin/aconfig_hello_world_cc /system/bin && adb shell aconfig_hello_world_cc
Change-Id: I1890aff70262343e18a62fb2efb2fd0e13a48fb2
 2023-07-21 09:12:01 -07:00
Treehugger Robot
b2fc359a17 Merge "Combine aconfig cache files into per-partition dumps." into main am: 21e6105b79 am: a8e2b20b71 am: 0bb978473c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2645008

Change-Id: I921eda33dd8b2367acf4d122ab0267c3c6e28879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 15:51:17 +00:00
Treehugger Robot
0bb978473c Merge "Combine aconfig cache files into per-partition dumps." into main am: 21e6105b79 am: a8e2b20b71 
Original change: https://android-review.googlesource.com/c/platform/build/+/2645008

Change-Id: Iac464f15fd2018202cdefb6f221eacf1870b9639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 15:07:10 +00:00
Treehugger Robot
a8e2b20b71 Merge "Combine aconfig cache files into per-partition dumps." into main am: 21e6105b79 
Original change: https://android-review.googlesource.com/c/platform/build/+/2645008

Change-Id: I0cb06ef2c8f1a541c10dcf82c8950c8a8e3b17a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 14:46:31 +00:00
Treehugger Robot
21e6105b79 Merge "Combine aconfig cache files into per-partition dumps." into main 2023-07-21 14:34:44 +00:00
Treehugger Robot
cbb4ada78b [automerger skipped] Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251" into udc-dev am: 06f546f9ee -s ours am: 306958e542 -s ours am: a33105ec6a -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I490fe5208777f8df7806406eda560aa19764ac44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 03:44:24 +00:00
Kelvin Zhang
e74e8e4a3f [automerger skipped] Handle symlinks when extracting zipfiles am: 2b2de0375f -s ours am: d095ae6d50 -s ours am: c37f581c2f -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I05b6417628c4143591bd91948b0eb1e71c91854f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 03:44:23 +00:00
Treehugger Robot
4fccca255f [automerger skipped] Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251" into udc-dev am: 06f546f9ee -s ours am: 630647a266 -s ours am: 14cfde832a -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 1e774245a4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I17554925cef6ae0c43157cb8fb6788ffa94e0079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 03:44:09 +00:00
Kelvin Zhang
7624bea13f [automerger skipped] Handle symlinks when extracting zipfiles am: 2b2de0375f -s ours am: d18b115cdb -s ours am: 34dbd7be14 -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 1e774245a4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I331482491633ea6070135bbe26162775ade6ec6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 03:44:07 +00:00
Treehugger Robot
7ed69171b1 [automerger skipped] Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251" into udc-dev am: 06f546f9ee -s ours am: 306958e542 -s ours am: e66c59e055 -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: Ie61d0a22bd8a4ed43cb7632340ce41d7bb549234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 03:43:44 +00:00
Kelvin Zhang
3288b61551 [automerger skipped] Handle symlinks when extracting zipfiles am: 2b2de0375f -s ours am: d095ae6d50 -s ours am: be55e92314 -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I3cf62ce71d3fd704f0d8dbbb349251829a98c1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 03:43:41 +00:00
Treehugger Robot
a33105ec6a [automerger skipped] Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251" into udc-dev am: 06f546f9ee -s ours am: 306958e542 -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: Ia9d64dcd173bd1ad1c594a3b62ca8810b03f82e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:59:37 +00:00
Kelvin Zhang
c37f581c2f [automerger skipped] Handle symlinks when extracting zipfiles am: 2b2de0375f -s ours am: d095ae6d50 -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: Ic9779dbb0a488696e30cc71283d215519452faf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:59:34 +00:00
Treehugger Robot
14cfde832a [automerger skipped] Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251" into udc-dev am: 06f546f9ee -s ours am: 630647a266 -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 1e774245a4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I7c038d91ca5fa1801a0833ffaaa1d0d6ddcc2b32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:58:17 +00:00
Kelvin Zhang
34dbd7be14 [automerger skipped] Handle symlinks when extracting zipfiles am: 2b2de0375f -s ours am: d18b115cdb -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 1e774245a4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I41234bb7997a322df164bbfacc85facd99900f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:58:12 +00:00
Treehugger Robot
e66c59e055 [automerger skipped] Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251" into udc-dev am: 06f546f9ee -s ours am: 306958e542 -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I9f9ea4adf26bc63cd886dc64e5c702439f83dd42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:57:32 +00:00
Kelvin Zhang
be55e92314 [automerger skipped] Handle symlinks when extracting zipfiles am: 2b2de0375f -s ours am: d095ae6d50 -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: Icca8b003d1e090fb694dac3743b124fba56aa09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:57:29 +00:00
Treehugger Robot
630647a266 [automerger skipped] Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251" into udc-dev am: 06f546f9ee -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 1e774245a4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I5318a1dd62bf9b29a2ade9e9842e05efccc230f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:16:09 +00:00
Kelvin Zhang
d18b115cdb [automerger skipped] Handle symlinks when extracting zipfiles am: 2b2de0375f -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 1e774245a4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I737f1cc4b92a15e444e818e51bacb79a3097f101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:16:07 +00:00
Treehugger Robot
306958e542 [automerger skipped] Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251" into udc-dev am: 06f546f9ee -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I5dfd2cdb83d474e150888ce85dcb66b386efc544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:14:47 +00:00
Kelvin Zhang
d095ae6d50 [automerger skipped] Handle symlinks when extracting zipfiles am: 2b2de0375f -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319

Change-Id: I8cee886b9a021bf5eb1d1896b627cffc5707b93f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:14:44 +00:00
Treehugger Robot
06f546f9ee Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251" into udc-dev 
* changes:
  Handle symlinks when extracting zipfiles
  Handle zip64 extra fields better
  Fix python3.11's support for zip64
  Use python based unzip function for portability
 2023-07-21 01:32:12 +00:00
Yi Kong
59272fbdb1 Merge "Remove dangling reference to LLVMgold.so" into main am: 7859cc45f7 am: 829f7e9de6 am: 7ebddc1486 am: 47074fd85d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2665360

Change-Id: I02a690299eb018d55460c5a798b5304b95b932d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:55:32 +00:00
David Fu
c0c051eca8 Merge "Added haiku-presubmit phony rule to makefile" into main am: 4c1bc5b9b7 am: efaab29fe3 am: f7cccf6722 am: 76d71db5e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2652359

Change-Id: Ifde1e93627d71339fd22ffe06fd4a296f0627eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:54:18 +00:00
Yi Kong
47074fd85d Merge "Remove dangling reference to LLVMgold.so" into main am: 7859cc45f7 am: 829f7e9de6 am: 7ebddc1486 
Original change: https://android-review.googlesource.com/c/platform/build/+/2665360

Change-Id: Ic1301b92ac0d7237ca30b7282ac20b69f7d2c5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:13:30 +00:00
David Fu
76d71db5e6 Merge "Added haiku-presubmit phony rule to makefile" into main am: 4c1bc5b9b7 am: efaab29fe3 am: f7cccf6722 
Original change: https://android-review.googlesource.com/c/platform/build/+/2652359

Change-Id: I8e3432fdec323a10dea68720d6a3493ebf11b561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:11:43 +00:00
Yi Kong
7ebddc1486 Merge "Remove dangling reference to LLVMgold.so" into main am: 7859cc45f7 am: 829f7e9de6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2665360

Change-Id: I187a71ad8d8a6091f3f4470eb9741f0c7248580c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 18:28:40 +00:00
David Fu
f7cccf6722 Merge "Added haiku-presubmit phony rule to makefile" into main am: 4c1bc5b9b7 am: efaab29fe3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2652359

Change-Id: Ia12b24f295b8af654752f6ee0244fd3d9e28266a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 18:28:22 +00:00
Yi Kong
829f7e9de6 Merge "Remove dangling reference to LLVMgold.so" into main am: 7859cc45f7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2665360

Change-Id: I36f43b3cf4dfec31128d3ba2093d96250551151e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 17:41:59 +00:00
David Fu
efaab29fe3 Merge "Added haiku-presubmit phony rule to makefile" into main am: 4c1bc5b9b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2652359

Change-Id: Id57d4bd4de3363e42637122c3d05900f28639a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 17:41:42 +00:00
Yi Kong
7859cc45f7 Merge "Remove dangling reference to LLVMgold.so" into main 2023-07-20 17:33:54 +00:00
David Fu
4c1bc5b9b7 Merge "Added haiku-presubmit phony rule to makefile" into main 2023-07-20 17:00:05 +00:00
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