diff options
| -rw-r--r-- | java/java.go | 22 | ||||
| -rw-r--r-- | java/lint_defaults.txt | 7 |
2 files changed, 23 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index 61f5949bb..e8f78ba4a 100644 --- a/java/java.go +++ b/java/java.go @@ -2844,12 +2844,12 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { if !bp2BuildInfo.hasKotlin { props = bazel.BazelTargetModuleProperties{ Rule_class: "java_library", - Bzl_load_location: "//build/bazel/rules/java:library.bzl", + Bzl_load_location: "//build/bazel/rules/java:rules.bzl", } } else { props = bazel.BazelTargetModuleProperties{ Rule_class: "kt_jvm_library", - Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl", + Bzl_load_location: "//build/bazel/rules/kotlin:rules.bzl", } } @@ -2929,7 +2929,8 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) { } props := bazel.BazelTargetModuleProperties{ - Rule_class: "java_binary", + Rule_class: "java_binary", + Bzl_load_location: "//build/bazel/rules/java:rules.bzl", } attrs := &javaBinaryHostAttributes{ Runtime_deps: runtimeDeps, @@ -2944,7 +2945,7 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) { ktName := m.Name() + "_kt" ktProps := bazel.BazelTargetModuleProperties{ Rule_class: "kt_jvm_library", - Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl", + Bzl_load_location: "//build/bazel/rules/kotlin:rules.bzl", } ktAttrs := &javaLibraryAttributes{ @@ -2981,7 +2982,10 @@ func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) { attrs := &bazelJavaImportAttributes{ Jars: jars, } - props := bazel.BazelTargetModuleProperties{Rule_class: "java_import"} + props := bazel.BazelTargetModuleProperties{ + Rule_class: "java_import", + Bzl_load_location: "//build/bazel/rules/java:rules.bzl", + } name := android.RemoveOptionalPrebuiltPrefix(i.Name()) @@ -2992,7 +2996,13 @@ func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) { Neverlink: bazel.BoolAttribute{Value: &neverlink}, Exports: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + name}), } - ctx.CreateBazelTargetModule(bazel.BazelTargetModuleProperties{Rule_class: "java_library"}, android.CommonAttributes{Name: name + "-neverlink"}, neverlinkAttrs) + ctx.CreateBazelTargetModule( + bazel.BazelTargetModuleProperties{ + Rule_class: "java_library", + Bzl_load_location: "//build/bazel/rules/java:rules.bzl", + }, + android.CommonAttributes{Name: name + "-neverlink"}, + neverlinkAttrs) } diff --git a/java/lint_defaults.txt b/java/lint_defaults.txt index 061f4d0db..1bb49962c 100644 --- a/java/lint_defaults.txt +++ b/java/lint_defaults.txt @@ -40,6 +40,13 @@ # NewApi checks will continue to be enforced for apex deps since # lint.strict_updatability_linting will be true for those Soong modules --disable_check NewApi +# Disable ChromeOS specific checks +--disable_check PermissionImpliesUnsupportedChromeOsHardware +# Disable UnsafeImplicitIntentLaunch until it can avoid false positives/crash +# TODO(265425607) +--disable_check UnsafeImplicitIntentLaunch +# InvalidId will give errors on ids defined like android:id="@androidprv:id/contentPanel" +--disable_check InvalidId # Downgrade existing errors to warnings --warning_check AppCompatResource # 55 occurences in 10 modules |