|
@@ -2738,9 +2738,11 @@ func (m *Library) convertJavaResourcesAttributes(ctx android.TopDownMutatorConte
|
|
|
type javaCommonAttributes struct {
|
|
|
*javaResourcesAttributes
|
|
|
*kotlinAttributes
|
|
|
- Srcs bazel.LabelListAttribute
|
|
|
- Plugins bazel.LabelListAttribute
|
|
|
- Javacopts bazel.StringListAttribute
|
|
|
+ Srcs bazel.LabelListAttribute
|
|
|
+ Plugins bazel.LabelListAttribute
|
|
|
+ Javacopts bazel.StringListAttribute
|
|
|
+ Sdk_version bazel.StringAttribute
|
|
|
+ Java_version bazel.StringAttribute
|
|
|
}
|
|
|
|
|
|
type javaDependencyLabels struct {
|
|
@@ -2871,10 +2873,6 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
|
|
|
if m.properties.Javacflags != nil {
|
|
|
javacopts = append(javacopts, m.properties.Javacflags...)
|
|
|
}
|
|
|
- if m.properties.Java_version != nil {
|
|
|
- javaVersion := normalizeJavaVersion(ctx, *m.properties.Java_version).String()
|
|
|
- javacopts = append(javacopts, fmt.Sprintf("-source %s -target %s", javaVersion, javaVersion))
|
|
|
- }
|
|
|
|
|
|
epEnabled := m.properties.Errorprone.Enabled
|
|
|
//TODO(b/227504307) add configuration that depends on RUN_ERROR_PRONE environment variable
|
|
@@ -2888,7 +2886,9 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
|
|
|
Plugins: bazel.MakeLabelListAttribute(
|
|
|
android.BazelLabelForModuleDeps(ctx, m.properties.Plugins),
|
|
|
),
|
|
|
- Javacopts: bazel.MakeStringListAttribute(javacopts),
|
|
|
+ Javacopts: bazel.MakeStringListAttribute(javacopts),
|
|
|
+ Java_version: bazel.StringAttribute{Value: m.properties.Java_version},
|
|
|
+ Sdk_version: bazel.StringAttribute{Value: m.deviceProperties.Sdk_version},
|
|
|
}
|
|
|
|
|
|
for axis, configToProps := range archVariantProps {
|
|
@@ -2979,19 +2979,9 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
|
|
|
deps := depLabels.Deps
|
|
|
if !commonAttrs.Srcs.IsEmpty() {
|
|
|
deps.Append(depLabels.StaticDeps) // we should only append these if there are sources to use them
|
|
|
-
|
|
|
- sdkVersion := m.SdkVersion(ctx)
|
|
|
- if sdkVersion.Kind == android.SdkPublic && sdkVersion.ApiLevel == android.FutureApiLevel {
|
|
|
- // TODO(b/220869005) remove forced dependency on current public android.jar
|
|
|
- deps.Add(bazel.MakeLabelAttribute("//prebuilts/sdk:public_current_android_sdk_java_import"))
|
|
|
- } else if sdkVersion.Kind == android.SdkSystem && sdkVersion.ApiLevel == android.FutureApiLevel {
|
|
|
- // TODO(b/215230098) remove forced dependency on current public android.jar
|
|
|
- deps.Add(bazel.MakeLabelAttribute("//prebuilts/sdk:system_current_android_sdk_java_import"))
|
|
|
- }
|
|
|
} else if !deps.IsEmpty() {
|
|
|
ctx.ModuleErrorf("Module has direct dependencies but no sources. Bazel will not allow this.")
|
|
|
}
|
|
|
-
|
|
|
var props bazel.BazelTargetModuleProperties
|
|
|
attrs := &javaLibraryAttributes{
|
|
|
javaCommonAttributes: commonAttrs,
|
|
@@ -3011,6 +3001,10 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
|
|
|
neverLinkAttrs := &javaLibraryAttributes{
|
|
|
Exports: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + name}),
|
|
|
Neverlink: bazel.BoolAttribute{Value: &neverlinkProp},
|
|
|
+ javaCommonAttributes: &javaCommonAttributes{
|
|
|
+ Sdk_version: bazel.StringAttribute{Value: m.deviceProperties.Sdk_version},
|
|
|
+ Java_version: bazel.StringAttribute{Value: m.properties.Java_version},
|
|
|
+ },
|
|
|
}
|
|
|
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name + "-neverlink"}, neverLinkAttrs)
|
|
|
|
|
@@ -3150,6 +3144,9 @@ func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
|
|
|
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(
|
|
|
javaLibraryBazelTargetModuleProperties(),
|