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

Commit e1118228 authored by Liz Kammer's avatar Liz Kammer
Browse files

Revert "Don't use java_library for java_import neverlink" 

Revert submission 2786699-import-sdk-version-none

Reason for revert: b/306220520

Reverted changes: /q/submissionid:2786699-import-sdk-version-none

Change-Id: I4fbe5fa54dc11fac898a7f15704833f01b9fa269
parent 05f487a4

bp2build/java_import_conversion_test.go

+21 −29
Original line number Diff line number Diff line
@@ -52,15 +52,13 @@ java_import { 
}

`,

		ExpectedBazelTargets: []string{

			MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{

				"srcs": `["import.jar"]`,

			}),

			MakeBazelTarget("java_import", "example_import", AttrNameToString{

				"jars": `[":example_import-jars"]`,

				"jars": `["import.jar"]`,

			}),

			MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{

				"jars":      `[":example_import-jars"]`,

			MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{

				"exports":     `[":example_import"]`,

				"neverlink":   `True`,

				"sdk_version": `"none"`,

			}),

		}})

}
@@ -88,19 +86,17 @@ java_import { 
}

`,

		ExpectedBazelTargets: []string{

			MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{

				"srcs": `select({

			MakeBazelTarget("java_import", "example_import", AttrNameToString{

				"jars": `select({

        "//build/bazel_common_rules/platforms/os:android": ["android.jar"],

        "//build/bazel_common_rules/platforms/os:linux_glibc": ["linux.jar"],

        "//conditions:default": [],

    })`,

			}),

			MakeBazelTarget("java_import", "example_import", AttrNameToString{

				"jars": `[":example_import-jars"]`,

			}),

			MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{

				"jars":      `[":example_import-jars"]`,

			MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{

				"exports":     `[":example_import"]`,

				"neverlink":   `True`,

				"sdk_version": `"none"`,

			}),

		}})

}
@@ -121,15 +117,13 @@ java_import_host { 
}

`,

		ExpectedBazelTargets: []string{

			MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{

				"srcs": `["import.jar"]`,

			}),

			MakeBazelTarget("java_import", "example_import", AttrNameToString{

				"jars": `[":example_import-jars"]`,

				"jars": `["import.jar"]`,

			}),

			MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{

				"jars":      `[":example_import-jars"]`,

			MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{

				"exports":     `[":example_import"]`,

				"neverlink":   `True`,

				"sdk_version": `"none"`,

			}),

		}})

}
@@ -148,15 +142,13 @@ func TestJavaImportSameNameAsJavaLibrary(t *testing.T) { 
}

`,

		ExpectedBazelTargets: []string{

			MakeBazelTarget("filegroup", "test_lib-jars", AttrNameToString{

				"srcs": `["test.jar"]`,

			}),

			MakeBazelTarget("java_import", "test_lib", AttrNameToString{

				"jars": `[":test_lib-jars"]`,

				"jars": `["test.jar"]`,

			}),

			MakeBazelTarget("java_import", "test_lib-neverlink", AttrNameToString{

				"jars":      `[":test_lib-jars"]`,

			MakeBazelTarget("java_library", "test_lib-neverlink", AttrNameToString{

				"exports":     `[":test_lib"]`,

				"neverlink":   `True`,

				"sdk_version": `"none"`,

			}),

		},

	}, func(ctx android.RegistrationContext) {

java/java.go

+15 −28
Original line number Diff line number Diff line
@@ -3403,14 +3403,9 @@ func createLibraryTarget(ctx android.Bp2buildMutatorContext, libInfo libraryCrea 
	return libName

}



type importAttributes struct {

type bazelJavaImportAttributes struct {

	Jars    bazel.LabelListAttribute

	Exports bazel.LabelListAttribute

	Neverlink *bool

}



type filegroupAttrs struct {

	Srcs bazel.LabelListAttribute

}



// java_import bp2Build converter.
@@ -3426,36 +3421,28 @@ func (i *Import) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) { 
		}

	}



	name := android.RemoveOptionalPrebuiltPrefix(i.Name())

	filegroupTargetName := name + "-jars"



	ctx.CreateBazelTargetModule(

		bazel.BazelTargetModuleProperties{

			Rule_class:        "filegroup",

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

		},

		android.CommonAttributes{Name: filegroupTargetName},

		&filegroupAttrs{

			Srcs: jars,

		},

	)



	attrs := &importAttributes{

		Jars: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + filegroupTargetName}),

	attrs := &bazelJavaImportAttributes{

		Jars: jars,

	}

	props := bazel.BazelTargetModuleProperties{

		Rule_class:        "java_import",

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

	}



	name := android.RemoveOptionalPrebuiltPrefix(i.Name())



	ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name}, attrs)



	neverlinkAttrs := &importAttributes{

		Jars:      attrs.Jars,

		Neverlink: proptools.BoolPtr(true),

	neverlink := true

	neverlinkAttrs := &javaLibraryAttributes{

		Neverlink: bazel.BoolAttribute{Value: &neverlink},

		Exports:   bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + name}),

		javaCommonAttributes: &javaCommonAttributes{

			Sdk_version: bazel.StringAttribute{Value: proptools.StringPtr("none")},

		},

	}

	ctx.CreateBazelTargetModule(

		props,

		javaLibraryBazelTargetModuleProperties(),

		android.CommonAttributes{Name: name + "-neverlink"},

		neverlinkAttrs)

}