StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,208 Commits 1 Branch 0 Tags
6e43d8126ae612e21208deb337cb15203d28cfb1
Commit Graph

51208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Artur Satayev
6e43d8126a Merge "Add support to max-target-s to generate_hiddenapi_lists" am: 4df5f992e3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1952026

Change-Id: I8bd3b34cd861a2a77bc1f14b4585d2985cdb848c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 17:52:33 +00:00
Artur Satayev
4df5f992e3 Merge "Add support to max-target-s to generate_hiddenapi_lists" 2022-05-03 17:28:38 +00:00
Paul Duffin
31cdf29eb1 Prevent non-app/non-test modules from statically including jacocoagent am: 0038a8d374 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2085343

Change-Id: Id262b6e9e63a621b952988f9668603a79e663daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:30:30 +00:00
Paul Duffin
0038a8d374 Prevent non-app/non-test modules from statically including jacocoagent 
(cherry picked from commit 3953153c9e)

Previously, the .impl library of java_sdk_library modules would end up
with the jacocoagent statically included. That is because their
Instrument flag was set to true when created by their parent. As that
was before the deps were added that meant that they ended up with a
static dependency on jacoagent (at least when UnbundledBuild() was
true).

That was not previously a problem because the .impl files were only
used at build time. However, a recent change to make updatable-media
statically include framework-media.impl (which statically included the
jacocoagent classes) broke the coverage build because the jacocoagent
classes are not in the permitted packages for the updatable-media.

When instrumenting the bootclasspath the jacocoagent library is added
to the art-bootclasspath-fragment.

The jacocoagent should only be statically included in apps, or test
apps. This change adds an extra flag to specify whether the module type
supports statically including the jacocoagent. This is set to true by
apps and test apps but not when the java_sdk_library creates the .impl
java_library preventing it from statically including jacocoagent.

Bug: 230967146
Bug: 229932396
Test: COVERAGE_MODULES=media \
      PRODUCT=mainline_modules_x86 \
      TARGET_BUILD_APPS=com.google.android.media \
      vendor/google/build/build_unbundled_coverage_mainline_module.sh
      # Fails without this change, passes with it.
Merged-In: Ic95cf11a05f59b67e623474ed3dd9be6b4442c42
Change-Id: Ic95cf11a05f59b67e623474ed3dd9be6b4442c42
 2022-05-03 10:11:59 +00:00
Treehugger Robot
6c356f40a2 Merge "Clean up minSdkVersionAllowlist" am: a0bab18a47 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083104

Change-Id: I9c72ff7ada368c987453e689e9f8bd427c41ca99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:25:23 +00:00
Treehugger Robot
a0bab18a47 Merge "Clean up minSdkVersionAllowlist" 2022-05-03 09:00:15 +00:00
Treehugger Robot
9a37c9bb75 Merge "Remove unused uses_sdks property for apexes" am: a6fcf9fd92 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2071390

Change-Id: Iab9d6f2841691b4cc31cf89512ff3a75de3ea8b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:23:09 +00:00
Treehugger Robot
09c23eb3b0 Merge "Remove version_selector mutator" am: 7f5b4e3229 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2060089

Change-Id: If6a21b33e7fcf3c9732b0220a15018114c9b5603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:22:48 +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
a6fcf9fd92 Merge "Remove unused uses_sdks property for apexes" 2022-05-03 03:24:59 +00:00
Treehugger Robot
7f5b4e3229 Merge "Remove version_selector mutator" 2022-05-03 03:06:57 +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
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
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
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
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
Jooyung Han
c743039b48 Clean up minSdkVersionAllowlist 
These modules have min_sdk_version set. No need to keep them in
allowlist.

Bug: 158059172
Test: m
Change-Id: Id9d3c62f4da941f26212ce69637469d82758c935
 2022-05-02 12:38:26 +09: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
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
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
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
e2570cd149 Merge "Allow BoringSSL's Rust bindings to build" am: e91f9d439e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2080138

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I996dc940bf7ed91681915bfb59d5dc69c1f0ab87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:01:36 +00:00
Treehugger Robot
91255a653f Merge "Prototype changes for multitree" am: 184a6b87e5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076401

Change-Id: I9454e90eba0ed585fdbb9ca1b5041e88c8ec14d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:01:14 +00:00
Treehugger Robot
969d2b5af9 Merge "Convert $(words) to Starlark" am: f8c3412822 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073975

Change-Id: I2c27e33b81ba0ad1edc30eaea9134233f3afea16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:00:15 +00:00
Treehugger Robot
87089903c2 Merge "Use --dependency-file when linking elf files." am: ff22afa704 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1975926

Change-Id: Ic3e05e629701597c79ce222e1b73ddbd0273b007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:00:06 +00:00
Paul Duffin
79c44417b0 Merge "Allow framework-media to build the framework-media.impl" am: fb14b52747 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079359

Change-Id: If34a3316c996a40ca0390b3858e589e85681e925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 17:59:55 +00:00
Matthew Maurer
e91f9d439e Merge "Allow BoringSSL's Rust bindings to build" 2022-04-29 17:40:24 +00:00
Treehugger Robot
9c60cc4f22 Merge "java_sdk_library_import: Delegate OutputFiles to impl library if needed" 2022-04-29 17:27:23 +00:00
Christopher Parsons
f485a95d3a Merge "Preserve depset structure from bazel aquery" 2022-04-29 14:49:31 +00:00
Paul Duffin
1e940d5b44 java_sdk_library_import: Delegate OutputFiles to impl library if needed 
Bug: 230846030
Test: m nothing
      # Cherry pick into build with prebuilts enabled to verify.
Change-Id: I5ac9b1cdd2fc61efbc988e84556202ff6cd57146
 2022-04-29 14:42:04 +01:00