StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,552 Commits 1 Branch 0 Tags
c519bc6f28a0fe44f1564da376a0a8df9adf9b25
Commit Graph

74552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liz Kammer
c519bc6f28 Merge "Add unconverted reason for jarjar incompatibility." into main am: 6b6b150d0a am: 7d941462bb am: 1397a3a96b am: 472f943b6d am: 44536d9bfa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696067

Change-Id: I7d831ad01c92b86d585764dc8cbcffa58a649353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 20:48:44 +00:00
Liz Kammer
44536d9bfa Merge "Add unconverted reason for jarjar incompatibility." into main am: 6b6b150d0a am: 7d941462bb am: 1397a3a96b am: 472f943b6d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696067

Change-Id: I6cc8aa28f3eb1a8eb100d78eb9f9c7d436245c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 20:07:01 +00:00
Kousik Kumar
461e217804 Merge "Revert "Revert "Remove env config fetcher code""" into main am: 97e9b0cb8e am: c9e6b1c75c am: 8fa7c9c2f9 am: c3ed010d3a am: 6266d3e7af 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2694552

Change-Id: I6010131fda5959b197508d5296fa262a5ec5eb06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 19:42:43 +00:00
Liz Kammer
472f943b6d Merge "Add unconverted reason for jarjar incompatibility." into main am: 6b6b150d0a am: 7d941462bb am: 1397a3a96b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696067

Change-Id: I8372caf28d38e5b101ecc242b42c9876137fa3b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 19:25:01 +00:00
Kousik Kumar
6266d3e7af Merge "Revert "Revert "Remove env config fetcher code""" into main am: 97e9b0cb8e am: c9e6b1c75c am: 8fa7c9c2f9 am: c3ed010d3a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2694552

Change-Id: I6cdb0513fefeb72d8fb34b5a3115f70cd22b553a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 18:57:08 +00:00
Liz Kammer
1397a3a96b Merge "Add unconverted reason for jarjar incompatibility." into main am: 6b6b150d0a am: 7d941462bb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696067

Change-Id: I70ab40e9b1733112763e283e170e1fff35305a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 18:38:02 +00:00
Kousik Kumar
c3ed010d3a Merge "Revert "Revert "Remove env config fetcher code""" into main am: 97e9b0cb8e am: c9e6b1c75c am: 8fa7c9c2f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2694552

Change-Id: I3b3089804a1bdd41e017b2f7708798334ac1f808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 18:16:45 +00:00
Treehugger Robot
cc5c580c61 Merge "Use string.Builder" into main am: 21b19f9ca8 am: eca25823d6 am: 717db5d2bf am: 8d143f6235 am: c988a86273 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696071

Change-Id: I4f3e5fa271a9d28e10a6e9ef2b425edcd8a89520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 18:15:32 +00:00
Liz Kammer
7d941462bb Merge "Add unconverted reason for jarjar incompatibility." into main am: 6b6b150d0a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696067

Change-Id: Iff5d19cbc473ae88f10a72e93581ea7c60495d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 17:53:06 +00:00
Treehugger Robot
c988a86273 Merge "Use string.Builder" into main am: 21b19f9ca8 am: eca25823d6 am: 717db5d2bf am: 8d143f6235 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696071

Change-Id: I1a0010bbe2b21537b43f8dc937bf80e6f72e2bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 17:29:41 +00:00
Kousik Kumar
8fa7c9c2f9 Merge "Revert "Revert "Remove env config fetcher code""" into main am: 97e9b0cb8e am: c9e6b1c75c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2694552

Change-Id: I8b1137912485ff7c93f5923333c6c92cc71caf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 17:29:26 +00:00
Liz Kammer
6b6b150d0a Merge "Add unconverted reason for jarjar incompatibility." into main 2023-08-08 17:19:13 +00:00
Kousik Kumar
c9e6b1c75c Merge "Revert "Revert "Remove env config fetcher code""" into main am: 97e9b0cb8e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2694552

Change-Id: I6ec5df70508b52b7a7e64a2888d1594fb36a0fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 16:48:16 +00:00
Treehugger Robot
8d143f6235 Merge "Use string.Builder" into main am: 21b19f9ca8 am: eca25823d6 am: 717db5d2bf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696071

Change-Id: I8c6810ff8af5d71600ca7138fff556edd19b6fc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 16:45:31 +00:00
Treehugger Robot
717db5d2bf Merge "Use string.Builder" into main am: 21b19f9ca8 am: eca25823d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696071

Change-Id: I23cf7396c75696c55c007fd997bd61f2f3d1f0f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 16:02:22 +00:00
Kousik Kumar
97e9b0cb8e Merge "Revert "Revert "Remove env config fetcher code""" into main 2023-08-08 15:59:56 +00:00
Treehugger Robot
eca25823d6 Merge "Use string.Builder" into main am: 21b19f9ca8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696071

Change-Id: Ic65a803b7aba9f96c6ab12a905e15d720867a0b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 15:19:51 +00:00
Treehugger Robot
21b19f9ca8 Merge "Use string.Builder" into main 2023-08-08 14:35:15 +00:00
usta
da2a211bbd Use string.Builder 
with 4000X clones of adbd, bp2build.Codegen time goes from 36s to 7s

Test: m bp2build and verify same BUILD.bazel files
Bug: 292281398
Change-Id: Ibd3b328a917fe5d1bdad67c67116da336f9033cb
 2023-08-08 13:29:07 +00:00
Paul Duffin
49d968ca2a [automerger skipped] Explicitly specify --api-overloaded-method-order source for metalava am: 2ba521e408 -s ours 
am skip reason: Merged-In I00e049e0d991e650ab9940a3d495ed2b6e7480f8 with SHA-1 7202ffebf9 is already in history

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

Change-Id: I393f2ece1c9c5f3aab303e7efab5a8c0d2f610b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 10:14:09 +00:00
Paul Duffin
6ef155edd5 [automerger skipped] Explicitly specify --api-class-resolution api for metalava am: d7d52fa7cc -s ours 
am skip reason: Merged-In Ief3c7f9dfdfa946f21cb048a579ec90309fb350f with SHA-1 5b7035f850 is already in history

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

Change-Id: I6f9b22439865d91680625f2e118bbe5bc810077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 10:14:01 +00:00
Paul Duffin
1d8dac1cd9 [automerger skipped] Remove reference to the deprecated and disabled Typo issue am: 8fcc99cc09 -s ours 
am skip reason: Merged-In I08eca8008af39ebe69442db419ebd3d3378aa0de with SHA-1 c0036491cd is already in history

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

Change-Id: Id25a1aad9b1e6a3bef05b8486424546b2e0db398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 10:13:49 +00:00
Joanne Chung
804614cac6 Merge "Revert "Export NewPrebuiltBuildTool"" into main am: 1d7964a941 am: 6177563eec am: 57197bd990 am: 36f9a1dc58 am: 64fe5b2ed9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2695230

Change-Id: I96035adc3a932fcfe6837af2e0690ca6ad08f000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:52:05 +00:00
Joanne Chung
64fe5b2ed9 Merge "Revert "Export NewPrebuiltBuildTool"" into main am: 1d7964a941 am: 6177563eec am: 57197bd990 am: 36f9a1dc58 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2695230

Change-Id: Ib09c6011658e65b869f23e4d3a3da60f1b3d4e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:04:07 +00:00
Joanne Chung
36f9a1dc58 Merge "Revert "Export NewPrebuiltBuildTool"" into main am: 1d7964a941 am: 6177563eec am: 57197bd990 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2695230

Change-Id: I1a3e00891eb0e045e1f13ec8130f463cdea75108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:20:19 +00:00
Spandan Das
a5718060d6 Merge changes I8ca452aa,I437fc890,If9446700 into main am: 09f6b1390c am: 7a3541282e am: 148d4525a8 am: 73f5cb845e am: 69ecdc97fb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2693013

Change-Id: If2b9c122fab566568ad7bec98755d5156dc426bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:08:24 +00:00
Joanne Chung
57197bd990 Merge "Revert "Export NewPrebuiltBuildTool"" into main am: 1d7964a941 am: 6177563eec 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2695230

Change-Id: Ie7578240544d9c3ac4a71f425a80df5b339b41b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:35:22 +00:00
Spandan Das
69ecdc97fb Merge changes I8ca452aa,I437fc890,If9446700 into main am: 09f6b1390c am: 7a3541282e am: 148d4525a8 am: 73f5cb845e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2693013

Change-Id: I102d76d85394c40e5a1549b09bb166cc512452dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:13:13 +00:00
Joanne Chung
6177563eec Merge "Revert "Export NewPrebuiltBuildTool"" into main am: 1d7964a941 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2695230

Change-Id: Iae68356543492a752ba24af86a6ce41aa6dac99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:49:00 +00:00
Joanne Chung
1d7964a941 Merge "Revert "Export NewPrebuiltBuildTool"" into main 2023-08-08 03:20:00 +00:00
Spandan Das
73f5cb845e Merge changes I8ca452aa,I437fc890,If9446700 into main am: 09f6b1390c am: 7a3541282e am: 148d4525a8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2693013

Change-Id: If9a0a597ab6a3cab78155a87de5fb7e8ac536739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:07:13 +00:00
Spandan Das
148d4525a8 Merge changes I8ca452aa,I437fc890,If9446700 into main am: 09f6b1390c am: 7a3541282e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2693013

Change-Id: I09218efc028b002e83937fb80999f567ab48066e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 02:20:53 +00:00
Joanne Chung
14e0956931 Revert "Export NewPrebuiltBuildTool" 
Revert submission 2696994-art-check-cfi

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_main-without-vendor&target=sdk-sdk_mac-next&lkgb=10623159&lkbb=10623764&fkbb=10623764, bug b/294917304

Reverted changes: /q/submissionid:2696994-art-check-cfi

Change-Id: Id4adc1266c3f643b8c312f390e708d148a161314
 2023-08-08 02:14:40 +00:00
Spandan Das
7a3541282e Merge changes I8ca452aa,I437fc890,If9446700 into main am: 09f6b1390c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2693013

Change-Id: I366aab41749e74b43f4001b18f61e14adea079e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:34:24 +00:00
Spandan Das
09f6b1390c Merge changes I8ca452aa,I437fc890,If9446700 into main 
* changes:
  Handle .proto files in different package for filegroups
  Handle .proto files that end up in a different package
  Allow creation of BazelTargets in a different directory
 2023-08-08 00:51:52 +00:00
Treehugger Robot
5188777dbe Merge "Export NewPrebuiltBuildTool" into main am: 541c1cab00 am: 0d568c9bb4 am: e3e799c94f am: 69a21146a7 am: a42ebe4244 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696878

Change-Id: Ie20358954b9475cc459a428ae4cd62b231e293b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 23:15:41 +00:00
Treehugger Robot
a42ebe4244 Merge "Export NewPrebuiltBuildTool" into main am: 541c1cab00 am: 0d568c9bb4 am: e3e799c94f am: 69a21146a7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696878

Change-Id: Id2bafdf357378ada42f5b0077bcfba0f82e0621d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 22:31:01 +00:00
Treehugger Robot
69a21146a7 Merge "Export NewPrebuiltBuildTool" into main am: 541c1cab00 am: 0d568c9bb4 am: e3e799c94f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696878

Change-Id: I614bba69a9215a3de4e834ef2b604c7e309a45ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 21:48:46 +00:00
Spandan Das
df3ec82b62 Handle .proto files in different package for filegroups 
Followup to aosp/2693190, this CL adds the support to filegroups.
<mod>__bp2build_converted is now an alias to a proto_library
target <mod>_proto. This proto_library will be created in a different
package if the .proto file exists in a different package.

Test: bp2build unit tests
Test: TH
Bug: 292583584
Change-Id: I8ca452aacf1a86dfc9e218464e38aab89afa5a29
 2023-08-07 21:39:05 +00:00
Treehugger Robot
e3e799c94f Merge "Export NewPrebuiltBuildTool" into main am: 541c1cab00 am: 0d568c9bb4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696878

Change-Id: I3aee4f988e351593e733230cb8f43b663643dc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 20:56:38 +00:00
Treehugger Robot
0d568c9bb4 Merge "Export NewPrebuiltBuildTool" into main am: 541c1cab00 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696878

Change-Id: Iea0f49ea7db66618272de91af4770f09bff1e3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 20:14:25 +00:00
Treehugger Robot
541c1cab00 Merge "Export NewPrebuiltBuildTool" into main 2023-08-07 19:27:44 +00:00
Spandan Das
c53767e434 Handle .proto files that end up in a different package 
Bazel poses a strict requirement that .proto files and proto_library
must be in the same package. This CL handles this automatically by
creating the proto_library in a separate dir/package if necessary

Implementation details
- Partition the `srcs` by package. `srcs` has been computed using
  `transformSubpackagePath`, so the information about packages is
  available at this point
- Create a proto_library in each package by using
  `CommonAttributes.Dir`. Collect all these additional libraries
  and put them in `info.Proto_libraries` so that they get added as deps
  of (cc|python|...)_proto_library
- Add an import_prefix to the proto_library in subpackages relative to
  the current directory. This relies on the assumption that every src is
  beneath the current directory (Soong will complain if a path in
  Android.bp contains ../)

filegroup module type uses a separate code-path to create proto_library.
This will be handled in the next CL in stack.

Test: bp2build unit tests
Test: TH
Test: Built the failing internal module mentioned in
b/292583584#comment1

Bug: 292583584

Change-Id: I437fc89092321b26c5f0511387cde9e84084d6f9
 2023-08-07 19:18:03 +00:00
Spandan Das
3131d679f2 Allow creation of BazelTargets in a different directory 
The current API restricts creation of targets to the directory of the
visited soong module. This CL proposes adding a `Dir` property in
`CommonAttributes` that can be used to create a bazel target in
a specific dir. The use case for this is to dynamically create
additional targets for proto_library that are adjacent to .proto files
(Bazel poses a strict requirement about proto_library being in the
same package as the .proto file, but Soong does not)

Usage is restricted to dirs that have an existing Android.bp file. There
are some places in bp2build where we use existence of Android.bp/BUILD
on filesystem to curate a compatible fully qualified path (e.g. headers).
If we use `CommonAttributes.Dir` to arbritraily create BUILD
files, then it might render those curated labels incompatible.

Test: go test ./bp2build

Change-Id: If9446700457eddfb389be9d9bde39087f67daa60
 2023-08-07 19:17:03 +00:00
Treehugger Robot
60765a22e5 Merge "cosmetic: unused argument" into main am: 38a72e717b am: 5f8cb8a875 am: f729398f6c am: e42aed92e4 am: aeba964bd2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2694827

Change-Id: I5fb34684c710fa2a3527710004b19d90a33e150b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 18:02:09 +00:00
Treehugger Robot
fe022c112c Merge "add bp2build subevents" into main am: 7660e71895 am: f819131fe5 am: 538754b2be am: d30a8188ad am: caa7b8a1a1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2647281

Change-Id: I26649246479e9e1c12dab789fbedcea8d2d56fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 18:01:41 +00:00
Kevin Jeon
dfc3e6b231 Merge "Revert "Add libdumpstateutil to vendor variant list"" into main am: 51732356b8 am: 5c97ef054d am: 514bd063f9 am: 7c78fa5699 am: 49f50c3e4a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2692526

Change-Id: I29dfdeefaa4feb2363d506a923a599124a89bb8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 17:40:06 +00:00
Treehugger Robot
aeba964bd2 Merge "cosmetic: unused argument" into main am: 38a72e717b am: 5f8cb8a875 am: f729398f6c am: e42aed92e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2694827

Change-Id: I9188e5e42fe81df2b85f3a4045ccbd5e48e99f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 17:18:48 +00:00
Treehugger Robot
caa7b8a1a1 Merge "add bp2build subevents" into main am: 7660e71895 am: f819131fe5 am: 538754b2be am: d30a8188ad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2647281

Change-Id: Ibef9bc108bbeafdd919e26d89a36b564a93971e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 17:18:12 +00:00
Kevin Jeon
49f50c3e4a Merge "Revert "Add libdumpstateutil to vendor variant list"" into main am: 51732356b8 am: 5c97ef054d am: 514bd063f9 am: 7c78fa5699 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2692526

Change-Id: I3e4e69dc819518987eaa54129211e651b68179c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-07 17:17:52 +00:00