satayev
384f0969fe
Merge "Add a converter for classpaths.proto between proto and json/text formats." am: 1be2290fdd
am: 1f3260fff3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1650410
Change-Id: Ifc71e83411a635eed70ce20cc7379dc2bc138d84
2021-04-07 13:25:20 +00:00
satayev
1f3260fff3
Merge "Add a converter for classpaths.proto between proto and json/text formats." am: 1be2290fdd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1650410
Change-Id: I73ca7673223f6d8a9f81c5f1b1b1e19852dd9e9d
2021-04-07 12:43:49 +00:00
satayev
1be2290fdd
Merge "Add a converter for classpaths.proto between proto and json/text formats."
2021-04-07 12:17:25 +00:00
Anton Hansson
ece1249dbb
Merge "Revert^2 "Set min_sdk_version for java imports in pom2bp"" am: da42a5a209
am: ddc1eb8a6a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1666020
Change-Id: I7ad8d56b7f11d6ec0dc2a47199e74c84d1661985
2021-04-07 11:26:13 +00:00
Anton Hansson
ddc1eb8a6a
Merge "Revert^2 "Set min_sdk_version for java imports in pom2bp"" am: da42a5a209
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1666020
Change-Id: Ia975c8efdc300e8e9129345a58c2959ba8a46a58
2021-04-07 10:39:40 +00:00
Pedro Loureiro
522dab8b8f
Merge "Update soong for new lint version" am: 9537d594ce
am: 50023a5a40
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664033
Change-Id: I6136fe27fb141dc2816809c43a6b122c49f024ba
2021-04-07 10:18:30 +00:00
Paul Duffin
73057c5172
Merge changes I45274836,I47268b81 am: de21202bd2
am: 6c9d9bd3b1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665746
Change-Id: I54195a9d8abc4fc7b835ea89f20e7e9e643ddb2c
2021-04-07 10:18:19 +00:00
Anton Hansson
da42a5a209
Merge "Revert^2 "Set min_sdk_version for java imports in pom2bp""
2021-04-07 10:13:05 +00:00
Pedro Loureiro
50023a5a40
Merge "Update soong for new lint version" am: 9537d594ce
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664033
Change-Id: I5b23c397a18a3f5135088e484455bc47dce74b35
2021-04-07 09:37:37 +00:00
Paul Duffin
6c9d9bd3b1
Merge changes I45274836,I47268b81 am: de21202bd2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665746
Change-Id: Ibe3784edddea640cbe361222b7ae30d9b7373eb7
2021-04-07 09:35:31 +00:00
Pedro Loureiro
9537d594ce
Merge "Update soong for new lint version"
2021-04-07 09:30:06 +00:00
Paul Duffin
de21202bd2
Merge changes I45274836,I47268b81
...
* changes:
Add PrebuiltNameFromSource
Add IsModulePreferred
2021-04-07 09:04:18 +00:00
Jingwen Chen
e9393958ac
Merge "Export OsTypeList through a function." am: d7d72398d5
am: 6ce372d743
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664302
Change-Id: Id6d5f7b638382a990139e5c58d496cb5d733a09b
2021-04-07 06:46:18 +00:00
Jingwen Chen
6ce372d743
Merge "Export OsTypeList through a function." am: d7d72398d5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664302
Change-Id: I503c635420dfcfe61301d85151615e59d6020011
2021-04-07 06:00:35 +00:00
Jingwen Chen
d7d72398d5
Merge "Export OsTypeList through a function."
2021-04-07 05:38:05 +00:00
Treehugger Robot
a93181a2a6
Merge "Make lint HTML output deterministic" am: 27d220662f
am: 49f37cda8a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665060
Change-Id: I654594507b7d26e8ef357c78b149fbe3bd606233
2021-04-07 00:32:15 +00:00
Treehugger Robot
49f37cda8a
Merge "Make lint HTML output deterministic" am: 27d220662f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665060
Change-Id: I1fb8c6e93d633e57a264479f80f983d5a3dd89ce
2021-04-06 23:47:40 +00:00
Ryan Prichard
a5934e3408
Merge "Remove libgcc toolchain libs for Android" am: 3f3bb83f81
am: f72c6f2e44
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663859
Change-Id: I174c007d38348c30c3e55fe5bc586c953631a0df
2021-04-06 23:27:37 +00:00
Treehugger Robot
27d220662f
Merge "Make lint HTML output deterministic"
2021-04-06 23:14:10 +00:00
Ryan Prichard
f72c6f2e44
Merge "Remove libgcc toolchain libs for Android" am: 3f3bb83f81
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663859
Change-Id: Ib146374bc8523756348c83a608266f06ec247cd2
2021-04-06 22:37:33 +00:00
Rupert Shuttleworth
59d482afdd
Merge "Fix syntax error in bazel_handler.go." am: b809bcf331
am: e551169c0b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664502
Change-Id: I960b1c86f8baf518b77fe464a2263ad6e24764da
2021-04-06 21:49:09 +00:00
Ryan Prichard
3f3bb83f81
Merge "Remove libgcc toolchain libs for Android"
2021-04-06 21:43:33 +00:00
Rupert Shuttleworth
e551169c0b
Merge "Fix syntax error in bazel_handler.go." am: b809bcf331
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664502
Change-Id: Ia11a35537eadb021f9f00d0112e3c7f9a75c55fd
2021-04-06 21:07:34 +00:00
Paul Duffin
864116ce3f
Add PrebuiltNameFromSource
...
Bug: 177892522
Test: m nothing
Change-Id: I45274836d59adbd6b2a2a848705b189398f1e766
2021-04-06 21:20:58 +01:00
Rupert Shuttleworth
b809bcf331
Merge "Fix syntax error in bazel_handler.go."
2021-04-06 20:19:11 +00:00
Paul Duffin
e1d3837645
Add IsModulePreferred
...
Bug: 177892522
Test: m nothing
Change-Id: I47268b81359d6fceb60e899a730b3b6034e09814
2021-04-06 21:18:34 +01:00
Jack He
89ad7037b5
Merge "Revert "Set min_sdk_version for java imports in pom2bp"" am: 4ff6cc91c8
am: d27932a433
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665860
Change-Id: I8aeaaab7046f147ff24d17380b19177c88066808
2021-04-06 19:50:17 +00:00
Jack He
d27932a433
Merge "Revert "Set min_sdk_version for java imports in pom2bp"" am: 4ff6cc91c8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665860
Change-Id: I1e778247bb11e47002c7e2ac5442444804348846
2021-04-06 19:29:57 +00:00
Treehugger Robot
855b5768cc
Merge "Set the usesNonSdk manifest attribute whan targeting module SDKs." am: 4238c5fe07
am: c952e7fad6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657320
Change-Id: Id9f34cbaf176160d68b31bf63e92c5144ecefea9
2021-04-06 19:29:20 +00:00
Christopher Parsons
ff2a9c6ada
Merge "Fix note_memtag bionic libraries in mixed builds" am: b7c6a7ef36
am: 27798cb5d6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663541
Change-Id: Ie2a89fe8bd23e45824e138a26c4cd43f3fab3984
2021-04-06 19:29:11 +00:00
Anton Hansson
ebfbad2969
Revert^2 "Set min_sdk_version for java imports in pom2bp"
...
f99ba27101
Change-Id: Ic88670182029ace2e6dcdcae2713cb48bb0f59cd
2021-04-06 19:21:34 +00:00
Jack He
4ff6cc91c8
Merge "Revert "Set min_sdk_version for java imports in pom2bp""
2021-04-06 18:57:57 +00:00
Jack He
f99ba27101
Revert "Set min_sdk_version for java imports in pom2bp"
...
Revert "Give pom2bp -default-min-sdk-version 24 param"
Revert submission 1662079-axd
Bug: 184656328
Reason for revert: Break build
Reverted Changes:
I2f4dc7585:Update androidx min_sdk_version in allowed_deps
I5cb8c736d:Give pom2bp -default-min-sdk-version 24 param
I3b029315a:Set min_sdk_version for java imports in pom2bp
Change-Id: Ic97cbd1714f6113188ad4647ce71105f9641fad7
2021-04-06 18:52:50 +00:00
Treehugger Robot
c952e7fad6
Merge "Set the usesNonSdk manifest attribute whan targeting module SDKs." am: 4238c5fe07
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657320
Change-Id: I13a5542d3eccf678d79bcb962bd25597f1f424c5
2021-04-06 18:44:09 +00:00
Christopher Parsons
27798cb5d6
Merge "Fix note_memtag bionic libraries in mixed builds" am: b7c6a7ef36
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663541
Change-Id: I172aae16a2682a4e37ab6c310d5cfbffa9bf196f
2021-04-06 18:42:41 +00:00
Treehugger Robot
4238c5fe07
Merge "Set the usesNonSdk manifest attribute whan targeting module SDKs."
2021-04-06 18:25:12 +00:00
Christopher Parsons
b7c6a7ef36
Merge "Fix note_memtag bionic libraries in mixed builds"
2021-04-06 17:57:59 +00:00
Pedro Loureiro
70acc3dc0c
Update soong for new lint version
...
Test: m nothing
Change-Id: Iaa9d37ef73f1fef5f2dbb8a840e774bb86c65bf7
2021-04-06 17:49:19 +00:00
Treehugger Robot
2292af0f2e
Merge "Only include used requests in cquery starlark" am: e09691ce78
am: 7527d76f53
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664540
Change-Id: I3da39689827b5afdb473ec17c4d2d2863daa1251
2021-04-06 17:38:01 +00:00
Artur Satayev
ca6fe3453a
Add a converter for classpaths.proto between proto and json/text formats.
...
The proto is used at build time to define classpath fragments to be read
and parsed at runtime by `derive_classpath` service; in order to define
and set BOOTCLASSPATH, DEX2OATCLASSPATH, and SYSTEMSERVERCLASSPATH
environ variables.
The tool is used for debugging and generation of binary protos.
Bug: 180105615
Test: m && launch_cvd with a follow up changes
Change-Id: I7e8b084e5f63e9aaad11da3221b909818e69e235
2021-04-06 18:37:13 +01:00
Martin Stjernholm
da18e6832b
Merge "Allow dependencies from platform variants to APEX modules (reland)." am: 313a349d6b
am: bb4aa7c1c1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664028
Change-Id: I6816db036c453f72fcd9852bdb9b2f5127a20ce5
2021-04-06 17:37:05 +00:00
Treehugger Robot
4bfa990c45
Merge "Remove unused constants for cquery requests" am: 06a466256d
am: 2278624e5b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664539
Change-Id: Ie6c9a408518943d3b81752437a5e9bd0999d665e
2021-04-06 17:36:15 +00:00
Treehugger Robot
7527d76f53
Merge "Only include used requests in cquery starlark" am: e09691ce78
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664540
Change-Id: Ic57642f2d1bad148bb68dce09b5ebdda1b816745
2021-04-06 17:10:22 +00:00
Martin Stjernholm
bb4aa7c1c1
Merge "Allow dependencies from platform variants to APEX modules (reland)." am: 313a349d6b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664028
Change-Id: I11060cdc71bdb79d8868affffb7a59f7e964cb7f
2021-04-06 17:10:12 +00:00
Treehugger Robot
2278624e5b
Merge "Remove unused constants for cquery requests" am: 06a466256d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664539
Change-Id: I1a0221124052a657d202707e5be58124f344b0bd
2021-04-06 17:04:29 +00:00
Rupert Shuttleworth
a29903fb22
Fix syntax error in bazel_handler.go.
...
Test: go fmt no longer complains.
Change-Id: I725fb1d13f0f88a94e44b1fdbe9080590af2347a
2021-04-06 16:17:33 +00:00
Treehugger Robot
e09691ce78
Merge "Only include used requests in cquery starlark"
2021-04-06 16:05:20 +00:00
Martin Stjernholm
313a349d6b
Merge "Allow dependencies from platform variants to APEX modules (reland)."
2021-04-06 15:57:00 +00:00
Treehugger Robot
06a466256d
Merge "Remove unused constants for cquery requests"
2021-04-06 15:55:17 +00:00
Martin Stjernholm
ec00900f83
Allow dependencies from platform variants to APEX modules (reland).
...
When `test_for` dependencies are added from libraries to APEX modules,
they can be created from the platform variants of the libraries, since
those are used for building tests. Hence we need an alias from the
platform variant of the APEX module to have a target for those
dependencies.
This is only necessary for libraries that are split by the APEX
mutator, i.e. is a member of some APEX. Normally that's not the case
for test libraries, but there may be exceptions (read
com.android.art.testing).
This relands https://r.android.com/1654679 after decoupling it from the
topic that caused b/184239856.
Test: m nothing
Bug: 183882457
Change-Id: If643c75ce9bc25fa01ad9d1e3ba8e1d060d03bb2
2021-04-06 14:24:26 +01:00