Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82acaf54 authored by Alix's avatar Alix Committed by Alix Espino
Browse files

Update load statements in java.go bp2build 

load statements will all now point to rules.bzl files and won't have to
be constantly updated.

Bug: 271612705
Test: CI
Change-Id: I663b9730f1b5b333682ea301ce4d9a505626faaa
parent eb33a1d4

java/java.go

+16 −6
Original line number Diff line number Diff line
@@ -2843,12 +2843,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,6 +2929,7 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) { 


	props := bazel.BazelTargetModuleProperties{

		Rule_class:        "java_binary",

		Bzl_load_location: "//build/bazel/rules/java:rules.bzl",

	}

	attrs := &javaBinaryHostAttributes{

		Runtime_deps: runtimeDeps,
@@ -2943,7 +2944,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{
@@ -2980,7 +2981,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())
@@ -2991,7 +2995,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)



}