Merge "bp2build java_libraries depend on Android SDK" (1b8942d4) · Commits · e / os / android_build_soong

bp2build/android_app_conversion_test.go

+5 −1

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ android_app {
		"srcs": `["app.java"]`,
		"manifest": `"AndroidManifest.xml"`,
		"resource_files": `["res/res.png"]`,
		"deps": `["//prebuilts/sdk:public_current_android_sdk_java_import"]`,
		}),
		}})
		}
		@@ -86,7 +87,10 @@ android_app {
		"resb/res.png",
		]`,
		"custom_package": `"com.google"`,
		"deps": `[":static_lib_dep"]`,
		"deps": `[
		"//prebuilts/sdk:public_current_android_sdk_java_import",
		":static_lib_dep",
		]`,
		}),
		}})
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -2030,6 +2030,11 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
		}

		var deps bazel.LabelList
		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.Label{Label: "//prebuilts/sdk:public_current_android_sdk_java_import"})
		}
		if m.properties.Libs != nil {
		deps.Append(android.BazelLabelForModuleDeps(ctx, m.properties.Libs))
		}