William Escande
49bc23b601
Clear apex.go entries for bluetooth libs am: 89bca3f301
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19111518
Change-Id: Ib43164dedb4fcd90addcecd570f195e08dc6428b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 00:55:59 +00:00
Kousik Kumar
fa78188414
Merge "Add a broad warning about missing LOAS creds" am: 9c4216a4c9
am: 98dcee0d82
am: 40b781f978
am: bdbeb58988
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2137974
Change-Id: Ieefa2987146a5ed0c216425f688125f858c8d7ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 00:25:08 +00:00
Xin Li
b08c21f4a9
[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: 42307c80c7
-s ours am: 0c29b6d365
-s ours am: f2664547f8
-s ours
...
am skip reason: Merged-In I1421fb0dbcdb759281259abfae7bddc9aecdaa56 with SHA-1 3d6cfd14d3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19093933
Change-Id: Ic592cc5b293f6a7a1acb587b35e871543522a43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 00:06:29 +00:00
Xin Li
2569ab20a7
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 313fdb5812
-s ours am: a5a98bdf49
-s ours am: 7178f71d98
-s ours
...
am skip reason: Merged-In I1421fb0dbcdb759281259abfae7bddc9aecdaa56 with SHA-1 3d6cfd14d3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19093933
Change-Id: I91433a919432ca6013d30758792704a416a38595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 00:01:57 +00:00
Kousik Kumar
bdbeb58988
Merge "Add a broad warning about missing LOAS creds" am: 9c4216a4c9
am: 98dcee0d82
am: 40b781f978
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2137974
Change-Id: Ia6eda1fb654ca256cadc3b22afe739b49e3ba99b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 23:51:48 +00:00
Kousik Kumar
40b781f978
Merge "Add a broad warning about missing LOAS creds" am: 9c4216a4c9
am: 98dcee0d82
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2137974
Change-Id: Ic8f546f4994442a01271109ff3fb75075917a60d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 23:32:16 +00:00
Kousik Kumar
98dcee0d82
Merge "Add a broad warning about missing LOAS creds" am: 9c4216a4c9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2137974
Change-Id: Iebb1fce62294e180f6885ccded90339c2f7bfb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 23:01:48 +00:00
Xin Li
f2664547f8
[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: 42307c80c7
-s ours am: 0c29b6d365
-s ours
...
am skip reason: Merged-In I1421fb0dbcdb759281259abfae7bddc9aecdaa56 with SHA-1 3d6cfd14d3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19093933
Change-Id: I4d3b582883bfc28710bc9d6b5b541fdc6969c5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 23:00:44 +00:00
Xin Li
7178f71d98
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 313fdb5812
-s ours am: a5a98bdf49
-s ours
...
am skip reason: Merged-In I1421fb0dbcdb759281259abfae7bddc9aecdaa56 with SHA-1 3d6cfd14d3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19093933
Change-Id: Ie4a70928454409515073637be4d3d79b5c705fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 22:56:13 +00:00
Kousik Kumar
9c4216a4c9
Merge "Add a broad warning about missing LOAS creds"
2022-06-29 22:40:36 +00:00
Xin Li
0c29b6d365
[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: 42307c80c7
-s ours
...
am skip reason: Merged-In I1421fb0dbcdb759281259abfae7bddc9aecdaa56 with SHA-1 3d6cfd14d3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19093933
Change-Id: I4fdb7d4dcd3936a21c48a46a68d71f57f5e3a8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 22:17:16 +00:00
Xin Li
a5a98bdf49
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 313fdb5812
-s ours
...
am skip reason: Merged-In I1421fb0dbcdb759281259abfae7bddc9aecdaa56 with SHA-1 3d6cfd14d3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19093933
Change-Id: I2e15d389f39e54cfbbf139be5046d0e641918dc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 22:12:43 +00:00
Xin Li
42307c80c7
Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master
2022-06-29 21:16:54 +00:00
Paul Duffin
ab45a34628
Avoid modifying Compile_dex property am: e7b1f5b0a5
am: 4edbd9f2ae
am: 6213488623
am: 3360bf9010
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139572
Change-Id: I340e73e0d1f67aee049a0e1d16973989f7f7dd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 18:38:27 +00:00
Kousik Kumar
7bc781949a
Add a broad warning about missing LOAS creds
...
This is to generally warn Google devs about lack of LOAS creds.
Given the switch to RBE, lack of LOAS creds will start resulting in build
failures, so adding a warning message ahead of time to all builds. Will
convert this to a build failure after a week.
We need LOAS creds to be able to even fetch the CDPush config file to
determine whether to use RBE in a build a not, which is why I'm making
this a broad error message across builds.
Test: ran "m nothing" build with / without gcert and with / without
"stubby" in $PATH and confirmed appropriate error message.
Bug: b/235985591
Change-Id: I15cbaf372b0a7b79f868a06c7d5ede19b49ae687
2022-06-29 17:48:52 +00:00
Paul Duffin
3360bf9010
Avoid modifying Compile_dex property am: e7b1f5b0a5
am: 4edbd9f2ae
am: 6213488623
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139572
Change-Id: Id81e6364a84a38adfc9bc21b5a945059eefb0ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 17:47:33 +00:00
Paul Duffin
6213488623
Avoid modifying Compile_dex property am: e7b1f5b0a5
am: 4edbd9f2ae
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139572
Change-Id: Ibc11e28a2928883e2d5c5ec1c896bd87ed8a45ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 17:22:14 +00:00
Paul Duffin
4edbd9f2ae
Avoid modifying Compile_dex property am: e7b1f5b0a5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139572
Change-Id: I23e617156f22bc8ca4c44e419cf6430f75633b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 17:02:14 +00:00
Paul Duffin
e7b1f5b0a5
Avoid modifying Compile_dex property
...
Previously, the code would modify the Compile_dex property to set it to
true if the module was part of an APEX as the APEX needs the dex file.
That lost information about whether the Compile_dex property was
specified in the .bp file and also meant that the APEX variant had
different properties to other variants which could result in unexpected
differences in behavior between them.
One of those differences can occur in the sdk snapshot generation code
which uses the Compile_dex property to determined whether to write a
compile_dex property in the generated snapshot. If it uses an APEX
variant then it will always add compile_dex: true but if it used a non
APEX variant then it would depend on the setting of compile_dex in the
source. That leads to the generated snapshot being affected not just
by the set of modules that are included but also how they were
specified.
This change stops modifying the properties and just uses a local
variable to store the updated value. All the other (4) uses of the
Compile_dex property were checked and 1 accesses the property before
it is updated, 2 access the property from a module type (Import) that
does not update the property and the other is in the sdk snapshot
generation code which accesses it after it has been modified but needs
to access the unmodified value.
This is needed for the follow up change that allows an sdk module to
reference an apex to automatically add exportable parts of the apex
contents to the sdk snapshot avoiding duplication which can lead to
errors.
Bug: 232401814
Test: m nothing
Change-Id: Ibc80d93473a266dc9f9900ec1cb175b51460b5e9
2022-06-29 10:15:52 +00:00
Treehugger Robot
4f7d0eb241
Merge "Refactor apexBundle code." am: 114ad30d76
am: 7028b50308
am: a416730bf1
am: 05941e95e1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2138053
Change-Id: I41db417767906075c49c274bab766773e5cebab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 09:17:56 +00:00
Treehugger Robot
05941e95e1
Merge "Refactor apexBundle code." am: 114ad30d76
am: 7028b50308
am: a416730bf1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2138053
Change-Id: Ic9fd2b9318f6f7cf57a7a6149cb527302a5fdbfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 08:55:21 +00:00
Treehugger Robot
a416730bf1
Merge "Refactor apexBundle code." am: 114ad30d76
am: 7028b50308
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2138053
Change-Id: I20c91b9425adffb44115dfc59e4b40cfa562b669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 08:32:59 +00:00
Treehugger Robot
7028b50308
Merge "Refactor apexBundle code." am: 114ad30d76
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2138053
Change-Id: Ic377908763cc1d8ab33ae55c9fa7887facd68903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 07:55:48 +00:00
Treehugger Robot
114ad30d76
Merge "Refactor apexBundle code."
2022-06-29 07:36:33 +00:00
Sasha Smundak
6f9e91d5e9
Refactor apexBundle code.
...
Move dependency walker out of GenerateAndroidBuildActions, reduce IDE
warnings.
Test: treehugger
Change-Id: I520c59772b1da7102d2a2364b2c56789455ea7fb
2022-06-28 22:47:43 -07:00
Treehugger Robot
a8d746f140
Merge "Add build/bazel_common_rules to mock bazel directories." am: f04c8b671a
am: 948b52c27e
am: ab53462563
am: e8ac45314a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139104
Change-Id: I081bd9a19fdca5644a9455efe422827e0e726775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 02:35:46 +00:00
Treehugger Robot
e8ac45314a
Merge "Add build/bazel_common_rules to mock bazel directories." am: f04c8b671a
am: 948b52c27e
am: ab53462563
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139104
Change-Id: I1e54b2c6994a4ddfac956d67bab56c3edab7742a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 02:02:31 +00:00
Treehugger Robot
ab53462563
Merge "Add build/bazel_common_rules to mock bazel directories." am: f04c8b671a
am: 948b52c27e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139104
Change-Id: Idc79a85d8e2babf1e7ce1708364339a3a481ff52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:45:10 +00:00
Colin Cross
9a7c477614
Reland: Don't use hwasan for non-bionic arm64 targets am: 88a029f710
am: 99df3a8832
am: e274c734c1
am: 945264dc33
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139096
Change-Id: If49192e187ef4e26382c265eb5b7e1462c19dde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:43:41 +00:00
Colin Cross
945264dc33
Reland: Don't use hwasan for non-bionic arm64 targets am: 88a029f710
am: 99df3a8832
am: e274c734c1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139096
Change-Id: I08cf0a8b04d6105008b1bbd6de502f5bf1d6dc87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:27:34 +00:00
Treehugger Robot
948b52c27e
Merge "Add build/bazel_common_rules to mock bazel directories." am: f04c8b671a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139104
Change-Id: Ia98170328a8b9a0fb7206d1d591db07e180e994a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:26:26 +00:00
William Escande
89bca3f301
Clear apex.go entries for bluetooth libs
...
The module availability to Bluetooth is currently hard-coded in apex.go.
We are in the process of cleaning the apex.go by adding the availability
in each required module
Test: Build + TH + boot phone & use bluetooth
Bug: 216433795
Change-Id: I883a12f89a6d7eb43778e04ac50d6af38dd97116
2022-06-29 01:04:15 +00:00
Treehugger Robot
f04c8b671a
Merge "Add build/bazel_common_rules to mock bazel directories."
2022-06-29 00:50:24 +00:00
Jooyung Han
d349961ed4
Merge "Remove min_sdk_version allowlist" into tm-dev-plus-aosp am: ef17c147f5
am: 93231295da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19075000
Change-Id: Ie6014df6a55e81b93d5f0ef1c0d60fb6698b4ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 00:47:38 +00:00
Colin Cross
e274c734c1
Reland: Don't use hwasan for non-bionic arm64 targets am: 88a029f710
am: 99df3a8832
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139096
Change-Id: Ie1e869225a90a8eb81bfe4036c926849f7b97906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 00:45:05 +00:00
Colin Cross
99df3a8832
Reland: Don't use hwasan for non-bionic arm64 targets am: 88a029f710
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139096
Change-Id: I672df301aaab7e7ce15e29799c632fbb4c1c0a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 00:25:52 +00:00
Jooyung Han
93231295da
Merge "Remove min_sdk_version allowlist" into tm-dev-plus-aosp am: ef17c147f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19075000
Change-Id: I5b5ed42d0806706e6f5fc655856deab511d6010d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 00:25:47 +00:00
Jooyung Han
ef17c147f5
Merge "Remove min_sdk_version allowlist" into tm-dev-plus-aosp
2022-06-28 23:52:42 +00:00
Yifan Hong
82799f2b7f
Add build/bazel_common_rules to mock bazel directories.
...
Test: build/soong/tests/run_integration_tests.sh
Change-Id: I647d122b5fc530b5a26bd69c141d3fdc9cca7424
2022-06-28 16:25:56 -07:00
William Escande
0ac940fab3
Merge "Clear apex.go entries for bluetooth libs" into tm-qpr-dev am: aec111952d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18743691
Change-Id: Ied2610e2599dea44e338b3d3f51bd5e873bf3400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 23:25:51 +00:00
William Escande
aec111952d
Merge "Clear apex.go entries for bluetooth libs" into tm-qpr-dev
2022-06-28 23:09:56 +00:00
Colin Cross
88a029f710
Reland: Don't use hwasan for non-bionic arm64 targets
...
Don't use hwasan for non-bionic arm64 targets, including
arm64-linux-musl and arm64 darwin.
This relands I67c07f26f25a9f9807ee21ee79c113ea11f65473 which was
accidentally reverted in I47a9322929baff2492c6e8db989ece01fcbeb133.
Bug: 236052820
Test: build arm64 musl sysroot
Change-Id: I77753ecb6f07aafa1b6e00ad6bf432f9c9744f79
2022-06-28 15:15:40 -07:00
Xin Li
313fdb5812
Merge tm-dev-plus-aosp-without-vendor@8763363
...
Bug: 236760014
Merged-In: I1421fb0dbcdb759281259abfae7bddc9aecdaa56
Change-Id: If059be00e6bdaaa94171b456afae1d585540639c
2022-06-28 21:23:06 +00:00
Kousik Kumar
ad3dbc133d
[automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
am: 905d2ed5d7
-s ours am: f75e6a131b
-s ours am: 29781b6a41
-s ours am: de2823e2a2
-s ours am: 14d60af563
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589
Change-Id: Iba09e8d18f5260e0ef1e7bf1c44139ba4b129466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 20:01:59 +00:00
Kousik Kumar
6325485e4f
[automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a
am: 3f87c8cd8b
am: 60b79a39f5
-s ours am: 7e0aec24ac
-s ours am: 6922cf6096
-s ours am: 9bfe5c21a2
-s ours
...
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 dbc313375a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588
Change-Id: I249646199471c693adbe82b2f10eccbaf5d8a7d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 20:01:51 +00:00
Kousik Kumar
6aad722003
[automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46
am: 1145dd81a7
am: f3d2edfd4b
-s ours am: b107bfb634
-s ours am: 843dc2abdd
-s ours am: 9dd1e123a5
-s ours
...
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 5990257d46
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587
Change-Id: I9286a9ea32681dceae4c522310008753d6a7d59c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 20:01:45 +00:00
Kousik Kumar
0dc7a14474
[automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
am: b8a8d8bb2c
-s ours am: a63d2406a6
-s ours am: a84cb411d8
-s ours am: 96a87be431
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589
Change-Id: I3ba6b692953d3ac48538c66ecceb6891a9544054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 20:01:38 +00:00
Kousik Kumar
eb36e472ab
[automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a
am: 0db3027fb7
-s ours am: 1a3e516781
-s ours am: a649298a40
-s ours am: 25943c45e3
-s ours
...
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 35faaef43e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588
Change-Id: I3d7a30880a3e6ac2b8d15ac04be9dcbb1edc73b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 20:01:32 +00:00
Automerger Merge Worker
fb1fbc844a
Merge "[automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46
am: 24a39050fd
-s ours am: 3b3b252748
-s ours am: 3843cc84c4
-s ours" into tm-d1-dev-plus-aosp am: 536ee94530
-s ours
...
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 5990257d46
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587
Change-Id: Ic56bcf3204f4b341f64b653f9f27e88b57ec66f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 20:01:26 +00:00
Kousik Kumar
01a3878bcb
[automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46
am: 24a39050fd
-s ours am: 3b3b252748
-s ours am: 3843cc84c4
-s ours am: 36f6d248eb
-s ours
...
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 a1d8fa9961
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587
Change-Id: Id690f25dd96e6c444e5ef645cbfab8e8f0f3a140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 20:01:25 +00:00