StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,136 Commits 1 Branch 0 Tags
c30cf482e7d13bf5f45db8bc9e5bc134024534d8
Commit Graph

72136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yu Liu
c30cf482e7 [automerger skipped] Merge "Revert "Make min_sdk overridable in override_apex"" into udc-dev am: e80e5d8531 am: 3719ea62d0 -s ours 
am skip reason: Merged-In I06d6e3c439ba541ae85dc148f91b184b9731b92d with SHA-1 9a65ff8d1f is already in history

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

Change-Id: I20b3180615c967995572ee25ecfc6bbe38f52c73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 21:55:46 +00:00
Yi Kong
dbdaa49646 [automerger skipped] Update clang version for Rust bindgen to clang-r487747c am: 3de0cb7b4d am: 53978690dc -s ours 
am skip reason: Merged-In I9092263024b5b8dc7a1538b00f318ef0d5c29bb7 with SHA-1 3de0cb7b4d is already in history

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

Change-Id: I3236daa91624d930aa2ced40f4ac7ac0dfea34e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 20:20:56 +00:00
Sam Delmerico
88e8979418 [automerger skipped] Merge changes from topic "cherrypicker-L99000000961168479:N91800001376948752" into udc-mainline-prod am: 9ead6b6555 -s ours 
am skip reason: Merged-In I42b8c0ddad8822a0a329e99ec4ec62f8c3546ee9 with SHA-1 6d65a0fc3d is already in history

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

Change-Id: I59ed9a33c1ab85304c7792ff5b9eda9b8c64998c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:04:00 +00:00
Sam Delmerico
f862eb035d [automerger skipped] add variant_version property to apexBundle am: aae62179ce -s ours 
am skip reason: Merged-In I42b8c0ddad8822a0a329e99ec4ec62f8c3546ee9 with SHA-1 6d65a0fc3d is already in history

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

Change-Id: I40177ec374e367dc3a9d7816d1d6905ceb838da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:03:56 +00:00
Sam Delmerico
9ead6b6555 Merge changes from topic "cherrypicker-L99000000961168479:N91800001376948752" into udc-mainline-prod 
* changes:
  add variant_version property to apexBundle
  add apex_available_name property to apexBundle
 2023-06-09 14:26:18 +00:00
Wei Li
c3bff2ed5e [automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: dabeb50e32 am: 807736433a -s ours 
am skip reason: Merged-In I645c013c39e3190fd96c4a549d39a331aced16bd with SHA-1 dff65b0114 is already in history

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

Change-Id: I9943e11a16eeb928e5ecaefe72e452d4e9aabe54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:43:03 +00:00
Wei Li
b3b6e8778e [automerger skipped] Export some make variables to Bazel through product variables. am: 5cfedc8062 am: 0e2209c2aa -s ours 
am skip reason: Merged-In I4fdd0f989d75045644e8f2e32d1eb77543a3b9f3 with SHA-1 5cfedc8062 is already in history

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

Change-Id: I3a6347597122c60bbe051e6b972ace6d37b54ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:43:00 +00:00
Treehugger Robot
7ece7084b5 Merge "Don't panic if no certificates found" into udc-dev am: 16ef197d6a am: 2cb91fe625 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23297153

Change-Id: I4d130cc9a89c2981399aa1ff78cff87c2cbe60ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:42:39 +00:00
Wei Li
ee197e307e [automerger skipped] Allowlist SBOM generation tool so it can be used in Bazel. am: 9d307945be am: 80c53b4ccc -s ours 
am skip reason: Merged-In I4ad68b0613410f40c79ee24d3eef779c2ad57815 with SHA-1 9d307945be is already in history

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

Change-Id: I927c75d08af35ee3a99dbee7700d277e2c28052e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:42:32 +00:00
Yi Kong
7a6a758819 [automerger skipped] Revert "Turn off stack protector check for noreturn calls" am: 79b9b94ea3 am: c6edb57534 -s ours 
am skip reason: Merged-In I2fc5826048ba5d00cabcc8401ac40a6f54812a44 with SHA-1 79b9b94ea3 is already in history

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

Change-Id: I6fd4df89af93b04539aae206dd9aa1c7028bc82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:42:24 +00:00
Treehugger Robot
79083bf0b9 [automerger skipped] Merge "Touch soong_build output at the end of main" into udc-dev am: 4020b810e9 am: eb845da768 -s ours 
am skip reason: Merged-In Ifefe66a0eb1c125e9ad5373d60437a1cb1e6fdec with SHA-1 74ac376769 is already in history

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

Change-Id: Ib6fb5a5218784e489a06ea112903adac87bd2863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:42:15 +00:00
Yi Kong
5a35130b61 Merge "Refactor LTO" am: f1d37b3511 am: 22c0870729 am: 6a9eea4fcb am: 8c8c070435 am: 42bac162a2 am: 61c57f2fe1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2619271

Change-Id: Ie1c8fea0e7f555df1b50f3b72595b70a19d74027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 07:18:08 +00:00
Treehugger Robot
a396ca244f Merge "Revert "mk2rbc: temporarily bump matching paths limit to 155. "" am: 5950b039b3 am: 88d9189d1b am: a002179132 am: 3e13d8e82f am: d0ab6d260e am: f6088c4a8c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620713

Change-Id: I0d562ebbe97283c44627249044e5f9c61e3fd2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 07:17:57 +00:00
Yi Kong
61c57f2fe1 Merge "Refactor LTO" am: f1d37b3511 am: 22c0870729 am: 6a9eea4fcb am: 8c8c070435 am: 42bac162a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2619271

Change-Id: I7c761b40fd9c7571f6338a31b526532394b1b48d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:28:23 +00:00
Treehugger Robot
f6088c4a8c Merge "Revert "mk2rbc: temporarily bump matching paths limit to 155. "" am: 5950b039b3 am: 88d9189d1b am: a002179132 am: 3e13d8e82f am: d0ab6d260e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620713

Change-Id: I40b7c0fc033d3ee9844bd8073cbbf57564a09a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:28:05 +00:00
Yi Kong
42bac162a2 Merge "Refactor LTO" am: f1d37b3511 am: 22c0870729 am: 6a9eea4fcb am: 8c8c070435 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2619271

Change-Id: I3920b211938a380739368733e69fd558132046ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 05:48:08 +00:00
Treehugger Robot
d0ab6d260e Merge "Revert "mk2rbc: temporarily bump matching paths limit to 155. "" am: 5950b039b3 am: 88d9189d1b am: a002179132 am: 3e13d8e82f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620713

Change-Id: I075eb55459b45b03a29f6bfd6905e4b044fb611b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 05:47:59 +00:00
Yi Kong
8c8c070435 Merge "Refactor LTO" am: f1d37b3511 am: 22c0870729 am: 6a9eea4fcb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2619271

Change-Id: If3f3fbb30da194989d4d711a9d0f27bfe282b1ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 05:02:30 +00:00
Treehugger Robot
3e13d8e82f Merge "Revert "mk2rbc: temporarily bump matching paths limit to 155. "" am: 5950b039b3 am: 88d9189d1b am: a002179132 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620713

Change-Id: I2df8c29843969d0d79d5dc1cae24196159952b59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 05:02:20 +00:00
Cole Faust
183d45b965 Merge "Allowlist build_image and its dependencies" am: f1815ea326 am: 4b469ec3aa am: d84ea8b9b0 am: de71345b28 am: dde62eb567 am: 72fe8fac33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620500

Change-Id: I254f12f2a8c260a49d50cc3fbb52bc8165a3e1ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 04:40:53 +00:00
Yi Kong
6a9eea4fcb Merge "Refactor LTO" am: f1d37b3511 am: 22c0870729 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2619271

Change-Id: Ifc78bc1077ac4eae2f03d5e18dc701d14c31cf12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 04:13:27 +00:00
Treehugger Robot
a002179132 Merge "Revert "mk2rbc: temporarily bump matching paths limit to 155. "" am: 5950b039b3 am: 88d9189d1b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620713

Change-Id: I1e279beab89108d058efca7f597445e12cbb9644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 04:13:08 +00:00
Cole Faust
72fe8fac33 Merge "Allowlist build_image and its dependencies" am: f1815ea326 am: 4b469ec3aa am: d84ea8b9b0 am: de71345b28 am: dde62eb567 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620500

Change-Id: I27260362535104f38be60c3805665278bb6ea39f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 03:50:00 +00:00
Treehugger Robot
8e88f42809 Merge changes from topic "cc_stem" am: f253d23e95 am: 2f69d2adfb am: 590caa1f88 am: 40f285ffd4 am: e9cccf48a4 am: b48779c171 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609265

Change-Id: Idd73641cad4204b02d99758f6037f9243685a499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 03:31:45 +00:00
Yi Kong
22c0870729 Merge "Refactor LTO" am: f1d37b3511 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2619271

Change-Id: I1472861f48b91d802df54227bca5914c31761bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 03:29:56 +00:00
Treehugger Robot
88d9189d1b Merge "Revert "mk2rbc: temporarily bump matching paths limit to 155. "" am: 5950b039b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620713

Change-Id: Ic3ac53f07d29683eae9ed34ae5279f5d4a35bb03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 03:29:46 +00:00
Yi Kong
f1d37b3511 Merge "Refactor LTO" 2023-06-09 03:16:22 +00:00
Yi Kong
895d241013 Refactor LTO 
We removed Full LTO support, now LTO is a binary choice. This allows us
to greatly simplify the LTO propagation logic.

Test: m
Test: GLBOAL_THINLTO=true m
Bug: 169004486
Change-Id: Ie4e453d7518c7069a7c755734dab1e776c16e656
 2023-06-09 03:15:49 +00:00
Cole Faust
dde62eb567 Merge "Allowlist build_image and its dependencies" am: f1815ea326 am: 4b469ec3aa am: d84ea8b9b0 am: de71345b28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620500

Change-Id: I4896b34de8317c31733b6433b7f42cb5f20af4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 03:09:30 +00:00
Treehugger Robot
5950b039b3 Merge "Revert "mk2rbc: temporarily bump matching paths limit to 155. "" 2023-06-09 02:44:09 +00:00
Treehugger Robot
b48779c171 Merge changes from topic "cc_stem" am: f253d23e95 am: 2f69d2adfb am: 590caa1f88 am: 40f285ffd4 am: e9cccf48a4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609265

Change-Id: Ic8c2133be264811038d772a2c1831d58c4c4edd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 02:41:18 +00:00
Cole Faust
de71345b28 Merge "Allowlist build_image and its dependencies" am: f1815ea326 am: 4b469ec3aa am: d84ea8b9b0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620500

Change-Id: I7baed5f0653e58cdd695630d69d10d55f91b86fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 02:21:54 +00:00
Treehugger Robot
e9cccf48a4 Merge changes from topic "cc_stem" am: f253d23e95 am: 2f69d2adfb am: 590caa1f88 am: 40f285ffd4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609265

Change-Id: I35ce6072ba8b8c4f6126ab7524cebebe776cfb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 01:57:38 +00:00
Cole Faust
d84ea8b9b0 Merge "Allowlist build_image and its dependencies" am: f1815ea326 am: 4b469ec3aa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620500

Change-Id: I4a4a213c2321d6ca883cbca5db15093b0b28d948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 01:53:04 +00:00
Treehugger Robot
40f285ffd4 Merge changes from topic "cc_stem" am: f253d23e95 am: 2f69d2adfb am: 590caa1f88 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609265

Change-Id: I8f6db2535c765093684dcf0e79ce00e316bf6a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 01:09:56 +00:00
Cole Faust
4b469ec3aa Merge "Allowlist build_image and its dependencies" am: f1815ea326 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620500

Change-Id: I29a8b14d27a61fcb36f346794b3db0b78db36706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 01:08:28 +00:00
Cole Faust
f1815ea326 Merge "Allowlist build_image and its dependencies" 2023-06-09 00:29:27 +00:00
Treehugger Robot
590caa1f88 Merge changes from topic "cc_stem" am: f253d23e95 am: 2f69d2adfb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609265

Change-Id: I74063a12437ee8d3e16fdccff259b29bee012235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 00:18:07 +00:00
Vinh Tran
39af6f2603 [automerger skipped] Merge changes from topic "cherrypicker-L81900000961112686:N90100001376046683" into udc-mainline-prod am: 4e066fbd42 -s ours 
am skip reason: Merged-In Ifdb260d8e2da9a5767f1e212393de4134b210616 with SHA-1 095819530a is already in history

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

Change-Id: If4a50fc41bc1dfbc76c1c9e6244cc11333f4df9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 23:55:31 +00:00
Vinh Tran
37c5a9c8ac [automerger skipped] Sandbox inputs to aidl rule in cc am: 0358fb73e8 -s ours 
am skip reason: Merged-In Ifdb260d8e2da9a5767f1e212393de4134b210616 with SHA-1 095819530a is already in history

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

Change-Id: Ic9ddf7bcdc3c3173b184034bdabb29cad053994c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 23:55:29 +00:00
Treehugger Robot
2f69d2adfb Merge changes from topic "cc_stem" am: f253d23e95 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609265

Change-Id: I2eb1f21da7a4b146df85c37a1223be29c0ed4c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 23:32:42 +00:00
Vinh Tran
4e066fbd42 Merge changes from topic "cherrypicker-L81900000961112686:N90100001376046683" into udc-mainline-prod 
* changes:
  Sandbox inputs to aidl rule in cc
  Allowlist libservices
  Pass includes attrs to cc_aidl_library
 2023-06-08 23:24:08 +00:00
Cole Faust
8ff3c63376 Revert "mk2rbc: temporarily bump matching paths limit to 155. " 
This reverts commit 30d48351be.

Reason for revert: The underlying issue was fixed in ag/23603641

Change-Id: Ibe2749c3bb7412132de6d96d178f54cd8d1d0666
 2023-06-08 22:53:16 +00:00
Treehugger Robot
f253d23e95 Merge changes from topic "cc_stem" 
* changes:
  Remove modules from denylist
  Update runpath for jni libs
  bp2build support for stem
 2023-06-08 22:38:34 +00:00
Aditya Kumar
58a19a179e Merge "[RISC-V] rv64gc_zbb for Android" am: 9d1a17d18a am: 74ee1e97ad am: 5c1274d3bd am: 56ecf3a03f am: ac736ca7cf am: 68dc21881d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617535

Change-Id: I390b3e1a0d50763ef6ef4f085fa39273181dfaad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 21:20:47 +00:00
Himanshu Rawat
511dd2c51e Merge "Revert "Add exports needed for Doclava"" am: 4ead3a807d am: a2beb1cc43 am: 62ee738899 am: 1cb43cfb05 am: c8a0fdbe02 am: e08e5c3be1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617527

Change-Id: Ieb2b0819cb40461cf95e053c447906283a84fa8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 21:19:05 +00:00
Sam Delmerico
aae62179ce add variant_version property to apexBundle 
This property allows modifying the variant version that is put into the
APEX manifest.

Bug: 285138555
(cherry picked from https://android-review.googlesource.com/q/commit:6d65a0fc3dde0e488b2af91d166c8d37630a5b2e)
Merged-In: I42b8c0ddad8822a0a329e99ec4ec62f8c3546ee9
Change-Id: I42b8c0ddad8822a0a329e99ec4ec62f8c3546ee9
 2023-06-08 21:01:38 +00:00
Sam Delmerico
1dc63117f2 add apex_available_name property to apexBundle 
This property allows developers to create multiple modules that provide
the same APEX implemenation with some differences. For example, an APEX
that targets the current SDK can be developed alongside an APEX that
targets a pre-S SDK. Common dependencies of these APEX modules can both
use the value of the apex_available_name property in their
apex_available lists and be packaged in either APEX module.

Bug: 285138555
(cherry picked from https://android-review.googlesource.com/q/commit:ca8165373070b45919e6a1879ebc11705b6c425c)
Merged-In: Ia2cb027e2f19bd6d3d1c02e3d3742a0122a43c97
Change-Id: Ia2cb027e2f19bd6d3d1c02e3d3742a0122a43c97
 2023-06-08 21:01:32 +00:00
Treehugger Robot
1f636e471c Merge "Reclassify OFL as notice per cl/537072410" am: 087642b8d2 am: e1e90c7702 am: d053ccc576 am: 6214ab2e38 am: dc8c9b547b am: 99c1ddb965 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2611894

Change-Id: I2c281b848baa0669a1b9e7876894883a75bc4a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 20:43:06 +00:00
Aditya Kumar
68dc21881d Merge "[RISC-V] rv64gc_zbb for Android" am: 9d1a17d18a am: 74ee1e97ad am: 5c1274d3bd am: 56ecf3a03f am: ac736ca7cf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617535

Change-Id: Ic66c3419957e63ea044e606c48a14c75d06778e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 20:35:14 +00:00