Commit Graph

89050 Commits

Author SHA1 Message Date
Gabriel Biren
779ea19ecd Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." am: a58ce5e9d3 am: 8fee18a6f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2627737

Change-Id: I6a14bcd0a31804ec7f69795c49a6893118aaf807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 16:43:04 +00:00
Gabriel Biren
8fee18a6f3 Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." am: a58ce5e9d3
Original change: https://android-review.googlesource.com/c/platform/build/+/2627737

Change-Id: I33c7269d88483337838d4f4291d8639623633a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 16:03:17 +00:00
Gabriel Biren
a58ce5e9d3 Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." 2023-06-21 15:19:51 +00:00
Treehugger Robot
4ff6dbe015 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb am: 1ff91ea214 am: adb009c0f5 am: eab5aff691
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I19f931f077b620a0b16d2243cae10659f4aff133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 09:03:35 +00:00
Treehugger Robot
eab5aff691 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb am: 1ff91ea214 am: adb009c0f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: Iee674951e793ef0378becd9b54d2338a41d410c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 08:24:24 +00:00
Treehugger Robot
adb009c0f5 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb am: 1ff91ea214
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I072e9977c10ea905c82ed7fddb27431447155b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:35:55 +00:00
Treehugger Robot
1ff91ea214 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: Ie855f1b5d0f4844165452135ab4fe1e75625c3ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:47:14 +00:00
Treehugger Robot
2a477ccdbb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I26c965b0079dacc14c1b4a83ce545a919d7f33cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:08:08 +00:00
Jooyung Han
6d273b9624 Do not pass TARGET_FLATTEN_APEX to soong
Soong no longer supports "flattened" apex. This makes
TARGET_FLATTEN_APEX no-op.

Will remove TARGET_FLATTEN_APEX later.

Bug: 279835185
Test: m && launch_cvd (cuttlefish)
Change-Id: I27c6181f5107fd27552304c5dd25d2c0a21c4bec
2023-06-21 14:22:00 +09:00
Treehugger Robot
d0c29cbdeb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" 2023-06-21 05:18:58 +00:00
Florian Mayer
4671ae0fcf [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 am: ae2b8d5cc3 am: e9946b73ef -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 8bb740db1a is already in history

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

Change-Id: Icac8d8cfdfe08085fa2fc0651f57e8a92def7ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 01:20:13 +00:00
Florian Mayer
c71e5a36b3 [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 -s ours am: 026628a226 -s ours am: 0fd39c13f9 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: Ia37d097273b56e1eb0aacacc11bca72b8ee73ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 01:13:48 +00:00
Florian Mayer
314771a1ed [automerger skipped] Add aosp_arm64_fullmte target am: 8bb740db1a -s ours am: ceac1f0d51 -s ours am: 32394dfeac -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I925b9387daa1528a2a6186a3a48f7423e8a3f59d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 01:13:45 +00:00
Florian Mayer
0ed6a0bfd7 [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 am: ae2b8d5cc3 -s ours am: c885b8eef9 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I528fab1ab911838874c1902aec428dac282319fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 01:13:35 +00:00
Florian Mayer
e9946b73ef Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 am: ae2b8d5cc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678385

Change-Id: Ib3d93e07871f8e145e147b8a0ef3ec1d39ef2dc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 00:35:53 +00:00
Florian Mayer
0fd39c13f9 [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 -s ours am: 026628a226 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I7551797225314b4b63e49075830c9a93cc2ab945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 00:35:43 +00:00
Florian Mayer
32394dfeac [automerger skipped] Add aosp_arm64_fullmte target am: 8bb740db1a -s ours am: ceac1f0d51 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: If50383af964ee9f6a34daa1a43a3092129443095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 00:35:38 +00:00
Florian Mayer
c885b8eef9 [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 am: ae2b8d5cc3 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I9d0cea33df19e9bfd771aefa3fe06cad7dd55938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 00:31:28 +00:00
Florian Mayer
ae2b8d5cc3 Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678385

Change-Id: Iedc8ba81a15a4dc542d1a774f7d79cc52ed1bca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 23:51:20 +00:00
Florian Mayer
026628a226 [automerger skipped] Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I4214aca679deb43c1530038d1ebdd7707f4ab1af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 23:47:18 +00:00
Florian Mayer
ceac1f0d51 [automerger skipped] Add aosp_arm64_fullmte target am: 8bb740db1a -s ours
am skip reason: Merged-In I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e with SHA-1 0352c44ab3 is already in history

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

Change-Id: I8650d1e202ef829b73b6fd7abe09414f6bea06da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 23:47:15 +00:00
Florian Mayer
9ea49efa29 Merge "Add aosp_arm64_fullmte target" into udc-dev 2023-06-20 23:10:32 +00:00
Mårten Kongstad
e35e854508 Merge "aconfig: make proto fields optional" am: a3b0027fdb am: 0201a71f0c am: a34196902b am: 2302e3c4be am: 7e959f06eb
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237

Change-Id: Ic333c743fa9204316b6ff21f8374077a544a3694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 23:02:28 +00:00
Mårten Kongstad
7e959f06eb Merge "aconfig: make proto fields optional" am: a3b0027fdb am: 0201a71f0c am: a34196902b am: 2302e3c4be
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237

Change-Id: I1f9325e9fd62d114ae3e7b3bae3b566f3a6c5e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 22:18:44 +00:00
Florian Mayer
e8cb3c5e85 [automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9 am: 824884e4a5 am: ea84ed07ea -s ours
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 0f79319bb8 is already in history

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

Change-Id: I413d362d8b9f2d837d0fc59b9860b132560780be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:58:05 +00:00
Florian Mayer
c852882cae [automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9 -s ours am: bfec611d38 -s ours am: 49293d30cc -s ours
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055 is already in history

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

Change-Id: I4c90e1b4feab5c1462bd4691fd138a164460e366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:53:38 +00:00
Florian Mayer
b8797dc813 [automerger skipped] Fix bug when memtag_heap in diag but not sanitizers am: 0f79319bb8 -s ours am: 78fcb463be -s ours am: 1c3d7c4c1a -s ours
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055 is already in history

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

Change-Id: I38b65618c4b81eb542bd350e8e3ac0b6c83f9830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:53:36 +00:00
Florian Mayer
486d467b64 [automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9 am: 824884e4a5 -s ours am: 7548f1b7e9 -s ours
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055 is already in history

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

Change-Id: I1dcf6ccab74c87788d5d53b0ca56d8ff6ff2298e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:52:30 +00:00
Mårten Kongstad
2302e3c4be Merge "aconfig: make proto fields optional" am: a3b0027fdb am: 0201a71f0c am: a34196902b
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237

Change-Id: I6c0d6c0195b41a71c5f8cb9701784e55ae2ef9f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:34:06 +00:00
Florian Mayer
ea84ed07ea Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9 am: 824884e4a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238

Change-Id: I2aa748525175648c54519c50af647ff4499bfd36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:09:32 +00:00
Florian Mayer
49293d30cc [automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9 -s ours am: bfec611d38 -s ours
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055 is already in history

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

Change-Id: Ifeae862bcd20a51b80e19155e2b2f158eefd3956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:09:22 +00:00
Florian Mayer
1c3d7c4c1a [automerger skipped] Fix bug when memtag_heap in diag but not sanitizers am: 0f79319bb8 -s ours am: 78fcb463be -s ours
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055 is already in history

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

Change-Id: I4bf0f722cb6cdbc448d367d0d78b204e3d9ff709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:09:20 +00:00
Florian Mayer
7548f1b7e9 [automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9 am: 824884e4a5 -s ours
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055 is already in history

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

Change-Id: Icdd01e09e2ca5595ff7b60a853f6f656d18db654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:06:58 +00:00
Zhi Dou
ee205db6ea Merge "aconfig: generate Java flag name constants" am: cff292f8b2 am: 1f7e9252ed am: 6b29eed1a1 am: 5ace4a9cc3 am: 44fa277858
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170

Change-Id: I00e61a7b147d92eddfaad876e4710d7fe5da5e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 20:47:33 +00:00
Mårten Kongstad
a34196902b Merge "aconfig: make proto fields optional" am: a3b0027fdb am: 0201a71f0c
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237

Change-Id: I59b511d99376a364cca6dc74e9c1fb1a97995943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 20:47:13 +00:00
Florian Mayer
bfec611d38 [automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9 -s ours
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055 is already in history

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

Change-Id: I59268504ab66e848bdeb2fbad756ffee8d30ef2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 20:24:10 +00:00
Florian Mayer
78fcb463be [automerger skipped] Fix bug when memtag_heap in diag but not sanitizers am: 0f79319bb8 -s ours
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055 is already in history

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

Change-Id: Iacc04080273db202a25cebab1ae2cab7c3c75c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 20:24:08 +00:00
Florian Mayer
824884e4a5 Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238

Change-Id: Ia6acfda4027a88c593f0bb6f903a94ad2948f2d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 20:23:41 +00:00
Mårten Kongstad
0201a71f0c Merge "aconfig: make proto fields optional" am: a3b0027fdb
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237

Change-Id: I697af95c091cf919fe0f094c03d83f99834d4ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 20:05:02 +00:00
Zhi Dou
44fa277858 Merge "aconfig: generate Java flag name constants" am: cff292f8b2 am: 1f7e9252ed am: 6b29eed1a1 am: 5ace4a9cc3
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170

Change-Id: Idab1fad7024baffcbefbd37597e2f4697de35d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 20:01:16 +00:00
Florian Mayer
ffd1290cc9 Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev 2023-06-20 19:50:47 +00:00
Zhi Dou
5ace4a9cc3 Merge "aconfig: generate Java flag name constants" am: cff292f8b2 am: 1f7e9252ed am: 6b29eed1a1
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170

Change-Id: I72c9c984f1e5f7380e027c6e6ada23c333a296a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 18:58:44 +00:00
Treehugger Robot
4bbbbf6a1c Merge "aconfig: use proto struct directly" am: 23788f85a4 am: 7639e644a3 am: 6a5ce4a2a9 am: 0531aac817 am: 19963ac819
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052

Change-Id: I26165b2a728699c3ce59be1a9f57a0e3f0397b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 18:54:44 +00:00
Mårten Kongstad
a3b0027fdb Merge "aconfig: make proto fields optional" 2023-06-20 18:47:08 +00:00
Wei Li
7c4f064a2b Support SBOM generation of m build unbundled APEXs.
Bug: 266726655
Test: banchan com.android.adbd arm64 userdebug && m dist
Test: build/soong/tests/sbom_test.sh
Change-Id: I7abadbc083ef66b0e8ace28de69a1a219670ec37
2023-06-20 11:23:56 -07:00
Zhi Dou
6b29eed1a1 Merge "aconfig: generate Java flag name constants" am: cff292f8b2 am: 1f7e9252ed
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170

Change-Id: Ib3c13cc9bb688aba2d458dd928b92dc77ce369a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 18:13:31 +00:00
Treehugger Robot
19963ac819 Merge "aconfig: use proto struct directly" am: 23788f85a4 am: 7639e644a3 am: 6a5ce4a2a9 am: 0531aac817
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052

Change-Id: I049d2c378b312a54f57a2dc5f9cd29028a05bb7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 18:12:37 +00:00
Zhi Dou
1f7e9252ed Merge "aconfig: generate Java flag name constants" am: cff292f8b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170

Change-Id: I21da79301c4dc8828c6b4b48923720121dc91342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:32:16 +00:00
Jiakai Zhang
7dbe6335af Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518 am: 9778268c87 am: aaa9e6ac0a am: 2721abe7d4 am: 3737a946a3
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038

Change-Id: Id358d550fc7dcf7d109ec10862d87250a367597f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:29:19 +00:00
Treehugger Robot
0531aac817 Merge "aconfig: use proto struct directly" am: 23788f85a4 am: 7639e644a3 am: 6a5ce4a2a9
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052

Change-Id: I92b8b44af3956702740f508119c491222fff659c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:28:39 +00:00