Dan Willemsen
f17feb05d7
Merge "Add java_binary_host support for Windows" am: b13daf2ba7
am: e8273d7bb0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832212
Change-Id: I754592162b305de2f64089985f40ca195c229ab1
2021-09-22 20:39:36 +00:00
Dan Willemsen
e8273d7bb0
Merge "Add java_binary_host support for Windows" am: b13daf2ba7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832212
Change-Id: I689e0da48cde43581890a8f46e185825a9984035
2021-09-22 20:27:45 +00:00
Dan Willemsen
b13daf2ba7
Merge "Add java_binary_host support for Windows"
2021-09-22 20:13:33 +00:00
Colin Cross
55639aee62
Merge changes I0b78ceeb,Ic57e1efd am: fac6fd0927
am: 2d1979da48
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1582568
Change-Id: I29d3b96c8337b29859411b84735497d237aff9f2
2021-09-22 18:44:10 +00:00
Colin Cross
2d1979da48
Merge changes I0b78ceeb,Ic57e1efd am: fac6fd0927
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1582568
Change-Id: I813744db1537c5a81d56e8b9bd1f05f848de1a5c
2021-09-22 18:30:49 +00:00
Colin Cross
fac6fd0927
Merge changes I0b78ceeb,Ic57e1efd
...
* changes:
Add environment variable to force keeping ANSI codes
Disable table mode in smart status if window size is not available
2021-09-22 18:19:15 +00:00
Romain Jobredeaux
9f773b2b4e
Merge "Exclude directories with manual BUILD files from bp2build." am: f05bea080b
am: 9ba010c641
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822113
Change-Id: I63c155d655cf9cd143d0046a1c19363a69575854
2021-09-22 18:02:54 +00:00
TreeHugger Robot
8c7089fde6
Merge "Changes tree built Robolectric name" into sc-dev-plus-aosp
2021-09-22 17:48:56 +00:00
Romain Jobredeaux
9ba010c641
Merge "Exclude directories with manual BUILD files from bp2build." am: f05bea080b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822113
Change-Id: I6543f9c9829b02e5e5a3ef50779d4f5b6d6cdc96
2021-09-22 17:48:17 +00:00
Romain Jobredeaux
f05bea080b
Merge "Exclude directories with manual BUILD files from bp2build."
2021-09-22 17:28:31 +00:00
Romain Jobredeaux
2ed2ac2498
Merge "Add a flag-protected (-pom2build) feature for pom2bp to produce Bazel BUILD files." am: 5ff942285c
am: b1ea6daec3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831712
Change-Id: Ic5348423187c7d9bbb67978334b346be87f8f7eb
2021-09-22 15:17:29 +00:00
Romain Jobredeaux
b1ea6daec3
Merge "Add a flag-protected (-pom2build) feature for pom2bp to produce Bazel BUILD files." am: 5ff942285c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831712
Change-Id: I26afbc797cc2489d1f206d7044623c2a4678b589
2021-09-22 14:59:46 +00:00
Romain Jobredeaux
5ff942285c
Merge "Add a flag-protected (-pom2build) feature for pom2bp to produce Bazel BUILD files."
2021-09-22 14:47:02 +00:00
Jingwen Chen
d595d4c966
Merge "bp2build: Refactor metrics collection to use exported functions." am: be27f964f5
am: d4b9edde7c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831634
Change-Id: Ibd2ea977365f8ae580b796e788fcb75d51484c07
2021-09-22 14:25:43 +00:00
Liz Kammer
cb59e1e5c9
Merge "Add TOP to run_cuj so it runs from the correct dir" am: 5b780b1ae2
am: 2d77611cab
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1823958
Change-Id: I938095b9061d47acce978c4f7c3f6ba948b53f0a
2021-09-22 14:25:38 +00:00
Jingwen Chen
d4b9edde7c
Merge "bp2build: Refactor metrics collection to use exported functions." am: be27f964f5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831634
Change-Id: I0527078f207765a6e0940e606cde03a9e148b33e
2021-09-22 14:17:33 +00:00
Jingwen Chen
be27f964f5
Merge "bp2build: Refactor metrics collection to use exported functions."
2021-09-22 14:16:12 +00:00
Liz Kammer
2d77611cab
Merge "Add TOP to run_cuj so it runs from the correct dir" am: 5b780b1ae2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1823958
Change-Id: If3ebe292402549051c920b8fb1e3a8a19bea2477
2021-09-22 14:12:33 +00:00
Liz Kammer
5b780b1ae2
Merge "Add TOP to run_cuj so it runs from the correct dir"
2021-09-22 13:54:26 +00:00
Treehugger Robot
66c1202ce3
Merge "Remove workaround for modules with missing BCP fragments, as they are present now." am: cd439a27e4
am: d5082754e0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828596
Change-Id: Ibba56d63c057cc4741320bc5d87fc0bf9b17a9b7
2021-09-22 10:49:09 +00:00
Treehugger Robot
d5082754e0
Merge "Remove workaround for modules with missing BCP fragments, as they are present now." am: cd439a27e4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828596
Change-Id: I81f0280f4ef5082fb80d4d906fa766b7fb78a296
2021-09-22 10:36:55 +00:00
Treehugger Robot
cd439a27e4
Merge "Remove workaround for modules with missing BCP fragments, as they are present now."
2021-09-22 10:18:36 +00:00
Treehugger Robot
bd515c314c
Merge "Revert "update build rules to use /data/local/tests/unrestricted"" am: 512ec3f4fe
am: dfcb3ff691
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832958
Change-Id: Id411fd023a1cc3aa773d11de6e1e07ec8410141d
2021-09-22 07:01:11 +00:00
Treehugger Robot
dfcb3ff691
Merge "Revert "update build rules to use /data/local/tests/unrestricted"" am: 512ec3f4fe
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832958
Change-Id: I1f99bcbca475bd29e165f735706cd2b3d913c113
2021-09-22 06:45:42 +00:00
Treehugger Robot
512ec3f4fe
Merge "Revert "update build rules to use /data/local/tests/unrestricted""
2021-09-22 06:33:44 +00:00
Guang Zhu
5c97bc698f
Revert "update build rules to use /data/local/tests/unrestricted"
...
Revert submission 1826231-native-test-path
Reason for revert: b/199996863
Bug: 199996863
Reverted Changes:
Ic106011a7:update build rules to use /data/local/tests/unrest...
Id727355ec:update build rules to use /data/local/tests/unrest...
Change-Id: Id53334a6169e58964ef86e78de738f29b32dd491
2021-09-22 04:20:22 +00:00
Treehugger Robot
bab7f0953c
Merge "Remove arch-variant from some python properties" am: 0bdaa188e1
am: 364f3baa71
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831852
Change-Id: I59a83f171ad8127f0300b554b0f25ab1a98a0ac0
2021-09-22 02:17:44 +00:00
Treehugger Robot
513137d5ae
[automerger skipped] Merge "[IRadioConfig] Add to VNDK variant list" am: 0f7dddcc9c
-s ours am: af59d812d3
-s ours
...
am skip reason: Merged-In Ibacc996f42c4bfa12b135247a2cebe1e28bbff09 with SHA-1 af68148d19
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828136
Change-Id: I6cccf82657600b19985819001e449d73d9b9ee16
2021-09-22 02:17:35 +00:00
Treehugger Robot
364f3baa71
Merge "Remove arch-variant from some python properties" am: 0bdaa188e1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831852
Change-Id: I4cfc92f22cebbecead5a0a4866e86e187bf494fb
2021-09-22 02:01:16 +00:00
Treehugger Robot
af59d812d3
[automerger skipped] Merge "[IRadioConfig] Add to VNDK variant list" am: 0f7dddcc9c
-s ours
...
am skip reason: Merged-In Ibacc996f42c4bfa12b135247a2cebe1e28bbff09 with SHA-1 af68148d19
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828136
Change-Id: Ida100b11896d6dcf3db9f804141e0eca6717a007
2021-09-22 02:01:06 +00:00
Treehugger Robot
0bdaa188e1
Merge "Remove arch-variant from some python properties"
2021-09-22 01:51:51 +00:00
Treehugger Robot
0f7dddcc9c
Merge "[IRadioConfig] Add to VNDK variant list"
2021-09-22 01:49:23 +00:00
Romain Jobredeaux
89cb22416d
Add a flag-protected (-pom2build) feature for pom2bp to produce Bazel BUILD files.
...
Note that this is an initial, rather crude attempt at this,
that unblocks generating BUILD files needed to build AOSP android apps.
In particular, note that
- Jetifier step currently ignored
- Visibility set to public for all output targets
- All dependencies are gathered in 'deps', though they are split under various categories in bp files
- Host, host-only notions are ignored for now
Test: Copy first 2 lines of, e.g. prebuilts/sdk/current/support/Android.bp to a BUILD.bazel file and run pom2bp -pom2build -regen BUILD.bazel
Bug: 198433754
Change-Id: I5efa93517e6c319fd828da5b16ba7efd2d90bca8
2021-09-21 20:36:07 +00:00
Spandan Das
883fad4cdf
Merge "Add Property.Type to bpdocs template" am: 235a9443b7
am: 9c30c0a1a6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1825054
Change-Id: Idb37e44e202328d478147cc0d6b8b4f852ad8c8a
2021-09-21 20:34:25 +00:00
Spandan Das
9c30c0a1a6
Merge "Add Property.Type to bpdocs template" am: 235a9443b7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1825054
Change-Id: I63c818a85c8e5f1b7b1b519ee5476054ecf9680a
2021-09-21 20:21:53 +00:00
Spandan Das
235a9443b7
Merge "Add Property.Type to bpdocs template"
2021-09-21 20:00:35 +00:00
Colin Cross
3c0fe0edc0
Add environment variable to force keeping ANSI codes
...
If SOONG_UI_ANSI_OUTPUT is set to a true value force the simple status
output to keep ANSI codes. This will allow buildbots to collect logs
with ANSI codes in them. Smart status output is not affected as it
always keeps ANSI codes.
Bug: 147310922
Test: manual
Change-Id: I0b78ceebb65125b8e8dafb4787816fb679d3eb3e
2021-09-21 12:53:30 -07:00
Colin Cross
72a28a6a13
Disable table mode in smart status if window size is not available
...
Make smart status output automatically disable table mode when the
window size is not available.
Bug: 147310922
Test: status_test.go
Change-Id: Ic57e1efd742e869bb84b6a86b3014335f5a65d39
2021-09-21 12:36:22 -07:00
TreeHugger Robot
b76ffce0b3
Merge "[IRadioConfig] Add to VNDK variant list" into stage-aosp-master am: a91b77734b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15875870
Change-Id: I86b40d35ac1a6af588d055e8d530b0340a976e7e
2021-09-21 17:42:41 +00:00
TreeHugger Robot
a91b77734b
Merge "[IRadioConfig] Add to VNDK variant list" into stage-aosp-master
2021-09-21 17:23:20 +00:00
Christopher Parsons
f360605c22
Merge "bp2build: reference static variants directly" am: ce0944fc96
am: 5a5ceb553e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832014
Change-Id: Ic70b1e1f48e8b1e9c526e778d4e5e375989ec44f
2021-09-21 15:46:53 +00:00
Christopher Parsons
5a5ceb553e
Merge "bp2build: reference static variants directly" am: ce0944fc96
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832014
Change-Id: I6314b59c55d7dcc65444d44f631d39ff566c49d9
2021-09-21 15:32:04 +00:00
Christopher Parsons
ce0944fc96
Merge "bp2build: reference static variants directly"
2021-09-21 15:13:43 +00:00
Anton Hansson
bc189f63c2
Merge "Add back the api_srcs argument" am: 8b1add6dd4
am: 825a2659e6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830032
Change-Id: Ie3c7bb9075c0b2f20717eb47a5e68e469741048c
2021-09-21 15:12:02 +00:00
Anton Hansson
825a2659e6
Merge "Add back the api_srcs argument" am: 8b1add6dd4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830032
Change-Id: I1dd0b451e8d195e7f382b649aedadebb804a429f
2021-09-21 14:57:36 +00:00
Anton Hansson
8b1add6dd4
Merge "Add back the api_srcs argument"
2021-09-21 14:45:02 +00:00
Dan Willemsen
8e6b37119a
Add java_binary_host support for Windows
...
So that the Windows build-tools package doesn't need to manually copy
the wrapper. Also fixes enabling java modules for Windows by hiding them
from Make, as the Make code does not handle Windows java modules
properly.
Bug: 187222815
Change-Id: I13534b38b9a9f4b5ff0630e028c3b4f88a6b34f8
2021-09-20 23:29:48 -07:00
Serik Beketayev
af68148d19
[IRadioConfig] Add to VNDK variant list
...
Test: build
Bug: 198331805
Change-Id: Ibacc996f42c4bfa12b135247a2cebe1e28bbff09
Merged-In: Ibacc996f42c4bfa12b135247a2cebe1e28bbff09
2021-09-21 04:52:44 +00:00
Treehugger Robot
fd5ff6bbaa
Merge "Add tidy_disabled_srcs property." am: 1b15345ac9
am: c41aa75dec
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831865
Change-Id: I9801a71a60dfef69b88554781ad49835b7ddd939
2021-09-21 04:17:00 +00:00
Treehugger Robot
c41aa75dec
Merge "Add tidy_disabled_srcs property." am: 1b15345ac9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831865
Change-Id: I430b1fcd21e417e1ca0382228229188e1b47c718
2021-09-21 03:58:15 +00:00