StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,299 Commits 1 Branch 0 Tags
3d509d8ca131b70c8295d77060b6bfcb2cb34a59
Commit Graph

100299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
8850a4e314 [automerger skipped] Merge "Merge aosp-24Q3-ts-dev" into aosp-main-future am: 9a3ec3465e -s ours 
am skip reason: Merged-In Ia1f94ba19bab1f2e3b129827ad5634023290dbc5 with SHA-1 0ddd61a73f is already in history

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

Change-Id: Ib655fecd24e77a9cf96d50db603ee4c3650c5b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 21:40:17 +00:00
Xin Li
68f183edba [automerger skipped] Merge aosp-24Q3-ts-dev am: d18271c0c2 -s ours 
am skip reason: Merged-In Ia1f94ba19bab1f2e3b129827ad5634023290dbc5 with SHA-1 0ddd61a73f is already in history

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

Change-Id: I2846f5b3665ccf2fbb568bc2522a14d852f4b766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 21:39:57 +00:00
Treehugger Robot
9ebd27ffcc Merge "Don't pack target tests into art-host-tests.zip." into main am: cb56fa972b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3232722

Change-Id: I35a32d11772af64517381b65564b849f50eecdd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 17:22:37 +00:00
Treehugger Robot
cb56fa972b Merge "Don't pack target tests into art-host-tests.zip." into main 2024-08-20 17:14:47 +00:00
Treehugger Robot
0117ccddad Merge "make/core/Makefile: Skip images for local builds by default." into main am: f38c15ab8e 
Original change: https://android-review.googlesource.com/c/platform/build/+/3211136

Change-Id: Ic6d952283a654d9de5c380dbf670e62f4bf242f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 17:05:39 +00:00
Treehugger Robot
f38c15ab8e Merge "make/core/Makefile: Skip images for local builds by default." into main 2024-08-20 16:48:51 +00:00
Jiakai Zhang
7731accb15 Don't pack target tests into art-host-tests.zip. 
art-host-tests.mk packs target tests into art-host-tests.zip. This
behavior has been there since the very first version
(https://r.android.com/1437898).

Today, this behavior normally does nothing because target tests are
included in the ART testing apex and therefore not visible to Make.
However, if we remove any target tests from the ART testing apex, this
behavior will start to cause problems (b/360150490), as it will pack
those removed target tests into art-host-tests.zip and continous testing
will fail to run them.

This change removes this behavior.

Bug: 357802879
Bug: 169111770
Bug: 360150490
Test: `m art-host-tests` and see that the output is bit-identical with
  and without the change.
Change-Id: I2e9abdf4ed51bd8dc91637d7502350dfafb4aa39
 2024-08-20 14:47:58 +00:00
Jerome Gaillard
c97c0b4a7c Add overlay files to layoutlib res.zip 
This adds resource overlay files to the res.zip file created by
layoutlib_data.mk. This also updates the script generating the
corresponding SBOM file.

Bug: 335355919
Test: m layoutlib
Change-Id: I2427be23720324eb03bd428d220b8777e3bf49bb
 2024-08-20 13:37:41 +01:00
Treehugger Robot
4a876883ff Merge "Add rbc version of soong_config_set_bool" into main am: 273f97b5a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/3229149

Change-Id: Ib0f6f2e65e9854b1cb9bfd346ed37e16793bea0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 01:37:26 +00:00
Treehugger Robot
273f97b5a3 Merge "Add rbc version of soong_config_set_bool" into main 2024-08-20 01:32:07 +00:00
Qing Shen
61ea5ce877 Merge "Add a coverage suffix to avoid Ninja file regeneration." into main am: ca2fe2cd81 
Original change: https://android-review.googlesource.com/c/platform/build/+/3206456

Change-Id: I2a80cc6e4aa094fe35cb7529b7be483dc396e1a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 01:19:53 +00:00
Qing Shen
ca2fe2cd81 Merge "Add a coverage suffix to avoid Ninja file regeneration." into main 2024-08-20 01:16:53 +00:00
Cole Faust
88eeea5b2e Add rbc version of soong_config_set_bool 
Bug: 342006386
Test: go test
Change-Id: Icd885bc576715f650c02d7f4043e6ace8842f0da
 2024-08-19 17:35:31 -07:00
Treehugger Robot
8867cacc31 Merge "Move large_screen_common.mk to AOSP" into main am: 7337727e7a 
Original change: https://android-review.googlesource.com/c/platform/build/+/3220401

Change-Id: I296e3dad3c329af54bef78d68448c377ab683eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-19 22:39:30 +00:00
Xin Li
9a3ec3465e Merge "Merge aosp-24Q3-ts-dev" into aosp-main-future 2024-08-19 22:38:56 +00:00
Treehugger Robot
7337727e7a Merge "Move large_screen_common.mk to AOSP" into main 2024-08-19 22:05:21 +00:00
Alex Klein
af49729c5a make/core/Makefile: Skip images for local builds by default. 
Packing and archiving the image are expensive operations.
Swap the image archive to dist-files for builders, and skip
building the raw image locally unless it's specifically
requested via the new PHONY targets.

Bug: None
Test: m, m dist, m pack-image
Change-Id: I2a3f1ebea689c23da88ca6d0757b827b7eb0c936
 2024-08-19 11:43:06 -06:00
Siarhei Vishniakou
a6488974f6 Add libmonkey_jni to base 
The monkey package is already part of "base" build. In this topic, we
are adding jni support to monkey, which will allow us to use libinput's
uinput infrastructure for motion injection.

In this CL, we also need to add libmonkey_jni to the base build. Without
this change, monkey fails to find the jni library, because 'flashall'
does not include this .so by default.

However, this change is not needed when running 'adb sync', which
correctly recognizes that the jni library is required and places it in
the right place on the device.

Bug: 344695913
Flag: EXEMPT refactor
Ignore-AOSP-First: relies on uinput infra not available in aosp
Test: adb shell monkey 1000 --pct-touch 100
Test: m && vendor/google/tools/flashall -w --disable_verity=true
Change-Id: Id6c381895e914f0c0ab8278fad31e82734f48cf5
 2024-08-19 09:58:16 -07:00
Prochin Wang
14e20a0a3f Merge "Add trendy team for Pixel Troubleshooting App" into main am: 104b7e4967 am: aefcbf683c 
Original change: https://android-review.googlesource.com/c/platform/build/+/3222583

Change-Id: Idb5cada1db5419ac828df9d763d44de8f5812e58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-18 15:34:30 +00:00
Prochin Wang
aefcbf683c Merge "Add trendy team for Pixel Troubleshooting App" into main am: 104b7e4967 
Original change: https://android-review.googlesource.com/c/platform/build/+/3222583

Change-Id: Ie6e9c542c5fb7ab55d254b269458c42b3d975744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-18 15:14:36 +00:00
Prochin Wang
104b7e4967 Merge "Add trendy team for Pixel Troubleshooting App" into main 2024-08-18 14:59:04 +00:00
Prochin Wang
9cdac7ae1e Add trendy team for Pixel Troubleshooting App 
Bug: 360332619
Test: m
Change-Id: I2ba6fb2009186b0ba439c66e348f65050e684ed2
 2024-08-17 14:42:02 +00:00
Ankur Bakshi
99678b8092 [automerger skipped] Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 8abae0d891 am: 117e8cf24d -s ours am: 7c0d437167 -s ours am: 44a4c2e9bc -s ours am: 75a5506bca -s ours 
am skip reason: Merged-In I45ca948c56b15f58d06f87850c5ddda6fa713cba with SHA-1 65e3548527 is already in history

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

Change-Id: If96fa0af3239b52d0d3790f021efd209a15c9a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:56:11 +00:00
Ankur Bakshi
8ee1b31276 [automerger skipped] Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 3b23dc3b67 am: 971db7e147 am: d88e48203e am: ec6871ee5b -s ours 
am skip reason: Merged-In I45ca948c56b15f58d06f87850c5ddda6fa713cba with SHA-1 65e3548527 is already in history

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

Change-Id: I7b2ab77916bd3ff4212bbf4afc0af61c9fa2152e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:55:38 +00:00
Ankur Bakshi
75a5506bca [automerger skipped] Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 8abae0d891 am: 117e8cf24d -s ours am: 7c0d437167 -s ours am: 44a4c2e9bc -s ours 
am skip reason: Merged-In I45ca948c56b15f58d06f87850c5ddda6fa713cba with SHA-1 65e3548527 is already in history

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

Change-Id: I69abddf397509770cfbae9631ca53eb63658c1da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:38:03 +00:00
Ankur Bakshi
c9162cb748 [automerger skipped] Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 8abae0d891 am: 117e8cf24d -s ours am: 7c0d437167 -s ours am: f5c01d71eb -s ours 
am skip reason: Merged-In I45ca948c56b15f58d06f87850c5ddda6fa713cba with SHA-1 65e3548527 is already in history

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

Change-Id: I7db7a2e81c9e0aeeed1c2e7d7ed75250d393fcda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:38:00 +00:00
Ankur Bakshi
ec6871ee5b Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 3b23dc3b67 am: 971db7e147 am: d88e48203e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: Ia6d879f571095611a7301ea129a49772b0bcac8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:37:38 +00:00
Ankur Bakshi
27835b6496 [automerger skipped] Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 3b23dc3b67 am: 971db7e147 am: 1c2482871b -s ours 
am skip reason: Merged-In I9edc7171d124f0cfa540fea6f0e06ba877910444 with SHA-1 2666d4443b is already in history

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

Change-Id: Ia1e3120bfe2cf996ae8dc14420decf9933253896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:37:28 +00:00
Ankur Bakshi
f5c01d71eb [automerger skipped] Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 8abae0d891 am: 117e8cf24d -s ours am: 7c0d437167 -s ours 
am skip reason: Merged-In I45ca948c56b15f58d06f87850c5ddda6fa713cba with SHA-1 65e3548527 is already in history

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

Change-Id: I4ee5eb01cd40e7002cf5e2348a36a20d0b5957d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:15:23 +00:00
Ankur Bakshi
44a4c2e9bc [automerger skipped] Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 8abae0d891 am: 117e8cf24d -s ours am: 7c0d437167 -s ours 
am skip reason: Merged-In I45ca948c56b15f58d06f87850c5ddda6fa713cba with SHA-1 65e3548527 is already in history

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

Change-Id: Ifcb2b5fa1e1a87fc7ee52e3523e7a0f240a17904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:15:17 +00:00
Ankur Bakshi
1c2482871b Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 3b23dc3b67 am: 971db7e147 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: I4e31c046ab7b1976152fa41713d2266310f18200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:15:06 +00:00
Ankur Bakshi
7c0d437167 [automerger skipped] Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 8abae0d891 am: 117e8cf24d -s ours 
am skip reason: Merged-In I45ca948c56b15f58d06f87850c5ddda6fa713cba with SHA-1 65e3548527 is already in history

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

Change-Id: I0b62d8389fd6562e358acc3b8c37a3ff60e658db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:14:57 +00:00
Ankur Bakshi
d88e48203e Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 3b23dc3b67 am: 971db7e147 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: I927b26a690a8c988dd6946ddc9e1b368fac7bdee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:14:46 +00:00
Ankur Bakshi
971db7e147 Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 3b23dc3b67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: I2ddf1e3c024103858881a8ba345afa98dab2a8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:46:02 +00:00
Ankur Bakshi
117e8cf24d Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 8abae0d891 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: Iaf8b90bfd2135978b48b6c2ef4904493124da55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:45:36 +00:00
Ankur Bakshi
8abae0d891 Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: I5e6273ce12fbde0a36ccf0be12bf41907622175a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:28:18 +00:00
Ankur Bakshi
3b23dc3b67 Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: Id8331695f7b74251ab0940d5760937ea6fae9984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:28:12 +00:00
Ankur Bakshi
f401ed0a40 Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: I363e837df2bee54aba2e3668848c2b4f7895794c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:07:11 +00:00
Abu Alkali
6ae26059ac Merge "Add trendy team for android media solutions playback" into main am: 1afb74365c am: 4954d2acf4 
Original change: https://android-review.googlesource.com/c/platform/build/+/3218475

Change-Id: I9ef0ccf96f209a26a3b93f9a54a05a30a5382167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:06:44 +00:00
Abu Alkali
4954d2acf4 Merge "Add trendy team for android media solutions playback" into main am: 1afb74365c 
Original change: https://android-review.googlesource.com/c/platform/build/+/3218475

Change-Id: I61bbafad7a2558bcf3166bfa3ab1351ebed75327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 21:48:37 +00:00
Ankur Bakshi
7b12323ac0 Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: I022a15869aac1ec35af5660ea088f0334b9f0a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 21:47:25 +00:00
Wei Li
36c594059f [automerger skipped] Merge "Creating a Trendy team rule for PTE-SysUI Bug: 351846385 Test: Manual Ignore-AOSP-First: Internal only (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4b0b5d405fc577ac879bf942428689b2f756ff1) Merged-In: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5 Change-Id: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5" into main am: c66e326c1d am: e4886caa0f -s ours 
am skip reason: Merged-In Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5 with SHA-1 d4b0b5d405 is already in history

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

Change-Id: I89e8351de551df43464fb44ba85cbaa7860cfeae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 21:43:00 +00:00
Abu Alkali
1afb74365c Merge "Add trendy team for android media solutions playback" into main 2024-08-16 21:25:33 +00:00
Ankur Bakshi
206ad86920 Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: I26786def25488b473509294a8776d6022035913a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 21:20:15 +00:00
Wei Li
e4886caa0f Merge "Creating a Trendy team rule for PTE-SysUI Bug: 351846385 Test: Manual Ignore-AOSP-First: Internal only (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4b0b5d405fc577ac879bf942428689b2f756ff1) Merged-In: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5 Change-Id: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5" into main am: c66e326c1d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3225902

Change-Id: I987ef2a4b44579a559ef0069c52442762db9ef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 21:14:47 +00:00
Ankur Bakshi
5ba07e338c Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: Ic8ecf1e61afc13faa113e5f1f12bb435b186e7ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 21:00:38 +00:00
Wei Li
c66e326c1d Merge "Creating a Trendy team rule for PTE-SysUI Bug: 351846385 Test: Manual Ignore-AOSP-First: Internal only (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4b0b5d405fc577ac879bf942428689b2f756ff1) Merged-In: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5 Change-Id: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5" into main 2024-08-16 20:55:12 +00:00
Ankur Bakshi
4c4c240d68 Update Security String to 2024-10-01 am: 65e3548527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: I6cbe246b8bd965ed9cc7593805bcbd6b8e6c98f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 20:40:59 +00:00
Zhi Dou
e0d4157f07 Merge "Revert^2 "DO NOT MERGE: manually cherry pick"" into aosp-main-future am: e4c2af820d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848929

Change-Id: Id5d1a8ed3b1cae89c2deca2e07d53c928f7ab4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 20:20:53 +00:00
Zhi Dou
79115dbfc3 Revert^2 "DO NOT MERGE: manually cherry pick" am: 36d279f781 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848929

Change-Id: I70fa87df77e888687087f8bc6b85b257a57ff008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 20:20:47 +00:00