Commit Graph

56781 Commits

Author SHA1 Message Date
Treehugger Robot
c45647c798 Merge "Add missing dependency on compose plugin in kapt rules" am: 6c59cdb5c7 am: 7a0e9509bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2084483

Change-Id: Ia854a3da32397f2dbfff756de500db781443595e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:52:00 +00:00
TreeHugger Robot
e8265bf65c [automerger skipped] Merge "Add buildinfo_prop module" into tm-dev am: a83d03c206 -s ours
am skip reason: Merged-In I120654ca23a68de414df8da2051c6677afbab441 with SHA-1 4f1f3d97ca is already in history

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

Change-Id: If9b4e34467630553e484c98c0d6580de4d037391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:22:48 +00:00
Inseob Kim
e43521c52b [automerger skipped] Add buildinfo_prop module am: c7c4746151 -s ours
am skip reason: Merged-In I120654ca23a68de414df8da2051c6677afbab441 with SHA-1 4f1f3d97ca is already in history

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

Change-Id: I58e35da011ec83867b1e33269efc94e1773c637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:22:44 +00:00
Yi Kong
1742f79f2e [automerger skipped] Update clang version to clang-r450784d am: b3089e8a20 -s ours
am skip reason: Merged-In If6c2c331044a363cb8f20a2516da894e72c4b7e7 with SHA-1 4f6c92765d is already in history

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

Change-Id: Ib70048c55d5b21ce87105c16e90d2088ef2f62fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:22:00 +00:00
Treehugger Robot
7a0e9509bc Merge "Add missing dependency on compose plugin in kapt rules" am: 6c59cdb5c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2084483

Change-Id: I89772b863d415df80eaae6ff3ea75c456d213182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:21:45 +00:00
TreeHugger Robot
a83d03c206 Merge "Add buildinfo_prop module" into tm-dev 2022-05-03 05:14:30 +00:00
Treehugger Robot
6c59cdb5c7 Merge "Add missing dependency on compose plugin in kapt rules" 2022-05-03 02:28:14 +00:00
Tianyu Jiang
dde3f8eda1 Merge "Revert "Update to clang-r450784e"" am: 5ae0cd2a38 am: aaf74b0443
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083810

Change-Id: I6da5df2ec6cde975e401e958fcc72be000503cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 00:09:00 +00:00
Tianyu Jiang
aaf74b0443 Merge "Revert "Update to clang-r450784e"" am: 5ae0cd2a38
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083810

Change-Id: I14f867ad1b53adcb1f04c8b9e5a00ee4b940a77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:37:13 +00:00
Tianyu Jiang
5ae0cd2a38 Merge "Revert "Update to clang-r450784e"" 2022-05-02 23:14:38 +00:00
Tianyu Jiang
cc84ca767d Revert "Update to clang-r450784e"
Revert submission 2080443-update-clang-8508608

Reason for revert: b/230930120
Reverted Changes:
I678829f02:Update to clang-r450784e

Change-Id: I89e336ec1deffddbbbf872a3ee4a1082a65fb137
2022-05-02 23:06:49 +00:00
Colin Cross
08b0a1cd79 Add missing dependency on compose plugin in kapt rules
The kapt rule uses kotlincFlags but was not using kotlincDeps,
causing the rule to get the -Xplugin argument on the compose
compiler plugin jar, but not have a dependency on it.

Bug: 231222079
Test: TestKotlinCompose
Change-Id: I4c2cf30fb7d8cad4eededa29f67f4ffd459caa41
2022-05-02 14:00:50 -07:00
Treehugger Robot
ee625b1a98 Merge "Update clang version to clang-r450784d" am: 5b70a8d677 am: e074fa4b99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083783

Change-Id: Ibcd74fb5baa8f9d7e7cded496aed533e252a46f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 19:41:50 +00:00
Treehugger Robot
e074fa4b99 Merge "Update clang version to clang-r450784d" am: 5b70a8d677
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083783

Change-Id: I3046febe18334afc5bb9c6e89dfc18ed1d6ce619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 19:14:26 +00:00
Yi Kong
b3089e8a20 Update clang version to clang-r450784d
Test: presubmit
Bug: 219872355
Change-Id: If6c2c331044a363cb8f20a2516da894e72c4b7e7
(cherry picked from commit 4f6c92765d)
Merged-In: If6c2c331044a363cb8f20a2516da894e72c4b7e7
2022-05-02 19:02:05 +00:00
Treehugger Robot
5b70a8d677 Merge "Update clang version to clang-r450784d" 2022-05-02 18:33:32 +00:00
Yi Kong
4f6c92765d Update clang version to clang-r450784d
Test: presubmit
Bug: 219872355
Change-Id: If6c2c331044a363cb8f20a2516da894e72c4b7e7
2022-05-02 23:52:44 +08:00
Martin Geisler
0f3a6cda0f Merge "Tell rustc to always use color output" am: 507f9b26d5 am: 5367b71ab1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2081418

Change-Id: I8c6a1dba6a5e3638b1421d4bc813854b97484be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 13:43:12 +00:00
Martin Geisler
5367b71ab1 Merge "Tell rustc to always use color output" am: 507f9b26d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2081418

Change-Id: I9cf0a2738dee0209977bf55dcad4f726723d261e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 13:16:03 +00:00
Martin Geisler
507f9b26d5 Merge "Tell rustc to always use color output" 2022-05-02 13:00:40 +00:00
Inseob Kim
c7c4746151 Add buildinfo_prop module
buildinfo_prop module is a replacement for build/make/tools/buildinfo.sh
so other images like microdroid can refer to build.prop.

For now, buildinfo_prop only supports a few build.prop properties, and
it's only used in microdroid.

Bug: 189164487
Test: build
Change-Id: I120654ca23a68de414df8da2051c6677afbab441
Merged-In: I120654ca23a68de414df8da2051c6677afbab441
(cherry picked from commit 4f1f3d97ca)
2022-05-02 09:51:45 +09:00
Treehugger Robot
38d7429735 Merge "Update locations of apex bzl files" am: a704eb1469 am: 1873bb0b18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2081644

Change-Id: I5cd4b83307f4d53c6b42ae13b0b52423b86174c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 01:03:43 +00:00
Treehugger Robot
1873bb0b18 Merge "Update locations of apex bzl files" am: a704eb1469
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2081644

Change-Id: I0309fa080801cbb54dd24f2ad3e9ef0860a26d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 00:39:49 +00:00
Treehugger Robot
a704eb1469 Merge "Update locations of apex bzl files" 2022-04-30 00:20:08 +00:00
Treehugger Robot
b99b6dd144 Merge "Remove warnings about mismatched types with builtins for stubs." am: b69919c70d am: 755be611c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2081784

Change-Id: I6eb6f647cdbfd3d81cc5602417226c0965ae114f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:18:48 +00:00
Treehugger Robot
755be611c1 Merge "Remove warnings about mismatched types with builtins for stubs." am: b69919c70d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2081784

Change-Id: Ia181284ebf36d70f26d7aa4656bec272c7ad4402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:53:21 +00:00
Spandan Das
68126fa03a [automerger skipped] Disable newapi check in defaults am: 2a42e55457 -s ours
am skip reason: Merged-In I8ef3137394011fb679a1129f80f6351fb05a4eff with SHA-1 397e910835 is already in history

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

Change-Id: I6a8aaf16aa9b5c9733f36a2223b2bd3df5311bb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:36:35 +00:00
Spandan Das
4b9c4b07d9 [automerger skipped] Enforce newapi check only if min_sdk_version < compile_sdk_version am: a3264efb42 -s ours
am skip reason: Merged-In Ic408857db7760d912ef4694d2ed72c0b7106eb04 with SHA-1 ba7e532a11 is already in history

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

Change-Id: Ib6cc27c9f078cb622fd3fd5d9940fa423440b01e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:36:31 +00:00
Paul Duffin
0040de7bc1 [automerger skipped] Merge "java_sdk_library_import: Delegate OutputFiles to impl library if needed" into tm-dev am: 2b5384bc93 -s ours
am skip reason: Merged-In I5ac9b1cdd2fc61efbc988e84556202ff6cd57146 with SHA-1 1e940d5b44 is already in history

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

Change-Id: Ib1c0cd068e80d79b530774e7a7d38c6be5b5771a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:36:12 +00:00
Paul Duffin
3f31389cca [automerger skipped] java_sdk_library_import: Delegate OutputFiles to impl library if needed am: 3cf140fe98 -s ours
am skip reason: Merged-In I5ac9b1cdd2fc61efbc988e84556202ff6cd57146 with SHA-1 1e940d5b44 is already in history

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

Change-Id: I47b86c68b1aed54fade7a0628ef44c7f4278263a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:36:11 +00:00
Paul Duffin
0fa599ffee [automerger skipped] hiddenapi: Prevent libraries for Q/R from include S+ flags. am: a80cc174a2 -s ours
am skip reason: Merged-In Ie0f68482603adc7b4e3d7a5c81bf203d81a84a9e with SHA-1 09817d66de is already in history

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

Change-Id: I0d1ddba9d9b8a5e5671bc7cccca7ec599b7a2c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:35:29 +00:00
Paul Duffin
0aca938805 [automerger skipped] Allow framework-media to build the framework-media.impl am: a083ec4acf -s ours
am skip reason: Merged-In I9e1837edcca6f5fa84fc611274cf8fbba8a896b8 with SHA-1 77590a8263 is already in history

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

Change-Id: I4da71a2705e8c03a4889343b391012a78fde5e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:34:58 +00:00
Treehugger Robot
b69919c70d Merge "Remove warnings about mismatched types with builtins for stubs." 2022-04-29 22:29:27 +00:00
Cole Faust
5f90da372e Update locations of apex bzl files
Bug: 230893497
Test: ./build/bazel/vendor/google/build_mainline_modules.sh
Test: b build //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal
Change-Id: Ib16bece720a9167d02d2ddd8c4f11257634d382b
2022-04-29 13:37:43 -07:00
Mitch Phillips
4e5f9a1521 Remove warnings about mismatched types with builtins for stubs.
Looks like new versions of the toolchain have an error about mismatching
the definitions used in the stubs with the builtin definitions. Since we
don't care about this when building stubs, ignore it by disabling the
builtin definitions.

Bug: N/A
Test: Build platform with ToT LLVM compiler.
Change-Id: I4e449c5fb96d0d5442fd57a7fea02ba69463324b
2022-04-29 13:12:28 -07:00
Cole Faust
a6babb77a7 Merge "Convert firstword/lastword to starlark functions instead of index operators" am: 7940585cf0 am: 312fda0653
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078798

Change-Id: Ib093f7c9aa16e6dc91d62e612944fbbec4839e24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 19:19:32 +00:00
Cole Faust
312fda0653 Merge "Convert firstword/lastword to starlark functions instead of index operators" am: 7940585cf0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078798

Change-Id: If241540a21eeec6abe3693f21431844ca9db3cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:50:49 +00:00
Cole Faust
7940585cf0 Merge "Convert firstword/lastword to starlark functions instead of index operators" 2022-04-29 18:32:40 +00:00
Matthew Maurer
92bd8dafdd Merge "Allow BoringSSL's Rust bindings to build" am: e91f9d439e am: e2570cd149
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2080138

Change-Id: I2e5e86712ea97654b3e664a684df9dea48dd4c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:26:37 +00:00
Treehugger Robot
ab954a80e5 Merge "java_sdk_library_import: Delegate OutputFiles to impl library if needed" am: 9c60cc4f22 am: 4bc5fbb974
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2081279

Change-Id: I5838bc533fa4c7ff44a25283a14cdcc27d6241d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:26:15 +00:00
Christopher Parsons
d86f2d0cc6 Merge "Preserve depset structure from bazel aquery" am: f485a95d3a am: b189af9c49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075349

Change-Id: I33edc6217d86aee12db67c349bc4e2a118d70175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:25:57 +00:00
Paul Duffin
64d5a525f4 Merge "hiddenapi: Prevent libraries for Q/R from include S+ flags." am: a09d95f605 am: c06a700dcc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079360

Change-Id: I47fca3348146cddbc042acb5fbfeea9dbfb7bb4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:24:49 +00:00
Victor Chang
197ec71ec9 Merge "Revert "Fix erroneous "Field requires API level 33 (current min is 32)" warnings"" am: 99666e2720 am: 611f75ea9a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2081278

Change-Id: Ib989959b0b864c46f519d57295c5647321db009c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:16:50 +00:00
Treehugger Robot
0e6a9b7c3d Merge "Fix crash in MakeString.EndsWith()" am: 2fe7af01af am: e10bff239b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078144

Change-Id: I1e14921492d5e49b8f5b8ad5e74f9844cdb3f9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:16:12 +00:00
Jooyung Han
9ad0e9aec9 Merge "Put rust_test.data_libs under lib[64]" am: fbcf7e1c91 am: b25e2382a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2080100

Change-Id: Ie03a1af3b966df573bed933c7d5cbc8174e7def5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:15:34 +00:00
Treehugger Robot
0c9fe97b4d Merge "Clean up min_sdk_version allowlist" am: 979a64f810 am: a72f626d9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076338

Change-Id: Ia6bf2024c500a0f67735e3c58790bfedc4b57b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:14:59 +00:00
Vinh Tran
c1a8f931a3 Merge "bp2build converts java_version property to javacopts attribute" am: 775b44fa50 am: f4b263c487
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072296

Change-Id: I65ceaa0414ca153fdb737af38dc7ec94c9a9e00e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:14:30 +00:00
Treehugger Robot
cbc94d7fc5 Merge "Update to clang-r450784e" am: 28881cbd55 am: 4a83601c95
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078625

Change-Id: I4c95c0fe770348fd017265f15b44b8f45a062bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:13:34 +00:00
Cole Faust
81754eaa93 Merge "Show load cycles when running mk2rbc" am: 01624a9c33 am: 0aa41c796e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078147

Change-Id: Ia202b7733b045ff295588f79b5ed923101970699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:12:48 +00:00
Cole Faust
8b387005df Merge "Recognize some unsupported functions" am: 2b6a312662 am: 323d7af832
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2077118

Change-Id: I844c972b87e9e141dbb07a8dc21863c75dd23976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:10:31 +00:00