Anton Hansson
52b99b10f5
Merge "Add annotations.zip support to java_sdk_library" am: 86da9c6a3d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832255
Change-Id: Id5625d0cc95fa1d235ee5eed6c008b9f555f876b
2021-09-23 09:49:26 +00:00
Anton Hansson
86da9c6a3d
Merge "Add annotations.zip support to java_sdk_library"
2021-09-23 09:39:38 +00:00
Sarah Chin
ef3dd96890
Merge "Add IRadio modules to VNDK" into stage-aosp-master
2021-09-23 02:58:32 +00:00
Dan Willemsen
37c59d4351
Disable protobuf deterministic randomness in soong_build am: 66213a64b2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1833333
Change-Id: I4fb3329f5190111d840860eafe83b5d64f0b848e
2021-09-23 02:07:37 +00:00
Dan Willemsen
66213a64b2
Disable protobuf deterministic randomness in soong_build
...
Soong writes out text protos for the sbox manifests, and if those change
every time soong changes, we trigger rebuilds of significant portions of
the tree. This is very annoying when attempting to iterate on Soong, so
disable this functionality at the soong_build level.
Bug: 200727888
Change-Id: Icf21e1775a4c4200e983c1b8ac66ddd780d7c90c
2021-09-22 15:07:53 -07: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
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
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
Anton Hansson
d78eb76f64
Add annotations.zip support to java_sdk_library
...
The annotations zip file is produced by the "main" sdk build and is
primarily consumed by android studio.
In order to support building the main SDK without requiring the sources
of all modules, we are adding module SDK artifacts that allows
reconstructing these outputs. The annotations zip contains XML files
which should be fairly easy to merge from all the individual parts.
Bug: 187397779
Test: unit tests in this CL
Test: m sdkextensions-sdk and inspect output
Change-Id: I955cae720e6f1382936836ee1d8fb11003f51b7d
2021-09-22 17:23:10 +01: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
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
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
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
Sarah Chin
84fdadfe83
Add IRadio modules to VNDK
...
Test: build
Bug: 198331451
Change-Id: Ia468b563c6485464db56b3c9cdbae80de6b3f165
2021-09-21 23:34:20 -07: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
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
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
a91b77734b
Merge "[IRadioConfig] Add to VNDK variant list" into stage-aosp-master
2021-09-21 17:23:20 +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
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
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
Treehugger Robot
1b15345ac9
Merge "Add tidy_disabled_srcs property."
2021-09-21 03:46:12 +00:00
Chih-Hung Hsieh
769a51cc6a
Add tidy_disabled_srcs property.
...
Used as a supplement to C/C++ srcs to disable
clang-tidy for selected srcs, when a library
contains many files in srcs and only some of them
are too large to compile with clang-tidy.
Test: WITH_TIDY=1 TIDY_TIMEOUT=90 make tidy-soong
Bug: 198098397
Change-Id: Ib32eb0e46ddbc717999797717bfd8c57e182ee88
2021-09-20 18:17:59 -07:00
Jingwen Chen
f02ef5707a
Merge "Fix bp2build-progress generating an empty converted_modules list, and duplicate module names." am: b3c3d9a2d5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831633
Change-Id: Ib004dcae1f80d6aa98f53c5be24d5c8790bc7b4f
2021-09-21 00:37:48 +00:00
Serik Beketayev
319c773900
[IRadioConfig] Add to VNDK variant list
...
Test: build
Bug: 198331805
Change-Id: Ibacc996f42c4bfa12b135247a2cebe1e28bbff09
Merged-In: Ibacc996f42c4bfa12b135247a2cebe1e28bbff09
2021-09-20 17:32:30 -07:00
Jingwen Chen
b3c3d9a2d5
Merge "Fix bp2build-progress generating an empty converted_modules list, and duplicate module names."
2021-09-21 00:24:36 +00:00
Aurimas Liutikas
2fa15f76a3
Merge "Enable compose kotlinc plugin when depending on the compose runtime" am: e992a52d0e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830673
Change-Id: I8becfa1da6f0b03d0fd839b5e60b6a5f9c662821
2021-09-20 23:53:09 +00:00
Aurimas Liutikas
e992a52d0e
Merge "Enable compose kotlinc plugin when depending on the compose runtime"
2021-09-20 23:28:33 +00:00
Martin Stjernholm
531d8fdc2a
Remove workaround for modules with missing BCP fragments, as they are
...
present now.
#codehealth
Test: presubmits
Bug: 192868581
Change-Id: I8370525849ea589af0bf4f8d3fd081f3004516a1
2021-09-20 23:47:24 +01:00
Colin Cross
0abff32886
Merge "Add support for d8 --main-dex-rules" am: 80bb3164b9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829133
Change-Id: Ib105939a0e11dae97b40cf003c75808ee1d879ec
2021-09-20 20:37:51 +00:00