Merge "Fix some issues in bp2build converter for python_binary_host." (f18404f3) · Commits · e / os / android_build_soong

android/allowlists/allowlists.go

+32 −1

Original line number	Diff line number	Diff line
		@@ -47,11 +47,13 @@ var (
		"bionic": Bp2BuildDefaultTrueRecursively,
		"bootable/recovery/minadbd": Bp2BuildDefaultTrue,
		"bootable/recovery/minui": Bp2BuildDefaultTrue,
		"bootable/recovery/applypatch": Bp2BuildDefaultTrue,
		"bootable/recovery/recovery_utils": Bp2BuildDefaultTrue,
		"bootable/recovery/tools/recovery_l10n": Bp2BuildDefaultTrue,

		"build/bazel": Bp2BuildDefaultTrueRecursively,
		"build/make/target/product/security": Bp2BuildDefaultTrue,
		"build/make/tools/releasetools": Bp2BuildDefaultTrue,
		"build/make/tools/signapk": Bp2BuildDefaultTrue,
		"build/make/tools/zipalign": Bp2BuildDefaultTrueRecursively,
		"build/soong": Bp2BuildDefaultTrue,
		@@ -109,6 +111,8 @@ var (
		"external/boringssl": Bp2BuildDefaultTrueRecursively,
		"external/bouncycastle": Bp2BuildDefaultTrue,
		"external/brotli": Bp2BuildDefaultTrue,
		"external/bsdiff": Bp2BuildDefaultTrueRecursively,
		"external/bzip2": Bp2BuildDefaultTrueRecursively,
		"external/conscrypt": Bp2BuildDefaultTrue,
		"external/e2fsprogs": Bp2BuildDefaultTrueRecursively,
		"external/eigen": Bp2BuildDefaultTrueRecursively,
		@@ -138,6 +142,7 @@ var (
		"external/libcap": Bp2BuildDefaultTrueRecursively,
		"external/libcxx": Bp2BuildDefaultTrueRecursively,
		"external/libcxxabi": Bp2BuildDefaultTrueRecursively,
		"external/libdivsufsort": Bp2BuildDefaultTrueRecursively,
		"external/libdrm": Bp2BuildDefaultTrue,
		"external/libevent": Bp2BuildDefaultTrueRecursively,
		"external/libgav1": Bp2BuildDefaultTrueRecursively,
		@@ -148,6 +153,7 @@ var (
		"external/libvpx": Bp2BuildDefaultTrueRecursively,
		"external/libyuv": Bp2BuildDefaultTrueRecursively,
		"external/lz4/lib": Bp2BuildDefaultTrue,
		"external/lz4/programs": Bp2BuildDefaultTrue,
		"external/lzma/C": Bp2BuildDefaultTrueRecursively,
		"external/mdnsresponder": Bp2BuildDefaultTrueRecursively,
		"external/minijail": Bp2BuildDefaultTrueRecursively,
		@@ -282,6 +288,7 @@ var (
		"system/core/libsysutils": Bp2BuildDefaultTrueRecursively,
		"system/core/libutils": Bp2BuildDefaultTrueRecursively,
		"system/core/libvndksupport": Bp2BuildDefaultTrueRecursively,
		"system/core/mkbootfs": Bp2BuildDefaultTrueRecursively,
		"system/core/property_service/libpropertyinfoparser": Bp2BuildDefaultTrueRecursively,
		"system/core/property_service/libpropertyinfoserializer": Bp2BuildDefaultTrueRecursively,
		"system/extras/toolchain-extras": Bp2BuildDefaultTrue,
		@@ -315,6 +322,7 @@ var (
		"system/timezone/apex": Bp2BuildDefaultTrueRecursively,
		"system/timezone/output_data": Bp2BuildDefaultTrueRecursively,
		"system/tools/aidl/build/tests_bp2build": Bp2BuildDefaultTrue,
		"system/tools/mkbootimg": Bp2BuildDefaultTrueRecursively,
		"system/tools/sysprop": Bp2BuildDefaultTrue,
		"system/unwinding/libunwindstack": Bp2BuildDefaultTrueRecursively,

		@@ -474,7 +482,6 @@ var (
		"prebuilt_stats-log-api-gen",

		// fastboot
		"bootimg_headers",
		"fastboot",
		"libfastboot",
		"liblp",
		@@ -507,6 +514,7 @@ var (

		//system/extras/verity/fec
		"fec",
		"boot_signer",

		//packages/apps/Car/libs/car-ui-lib/car-ui-androidx
		// genrule dependencies for java_imports
		@@ -1245,6 +1253,29 @@ var (
		"launcherprotosnano",
		"datastallprotosnano",
		"devicepolicyprotosnano",
		"ota_metadata_proto_java",
		"merge_ota",

		// releasetools
		"releasetools_fsverity_metadata_generator",
		"verity_utils",
		"check_ota_package_signature",
		"check_target_files_vintf",
		"releasetools_check_target_files_vintf",
		"releasetools_verity_utils",
		"build_image",
		"ota_from_target_files",
		"releasetools_ota_from_target_files",
		"releasetools_build_image",
		"add_img_to_target_files",
		"releasetools_add_img_to_target_files",
		"fsverity_metadata_generator",
		"sign_target_files_apks",

		// depends on the support of yacc file
		"libapplypatch",
		"libapplypatch_modes",
		"applypatch",
		}

		Bp2buildCcLibraryStaticOnlyList = []string{}

android/module.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -1246,12 +1246,14 @@ func (attrs CommonAttributes) fillCommonBp2BuildModuleAttrs(ctx topDownMutator
		// when generated as the 'data' label list attribute in Bazel. Remove it if
		// it exists. See b/247985196.
		_, requiredWithoutCycles := RemoveFromList(ctx.ModuleName(), mod.commonProperties.Required)
		requiredWithoutCycles = FirstUniqueStrings(requiredWithoutCycles)
		required := depsToLabelList(requiredWithoutCycles)
		archVariantProps := mod.GetArchVariantProperties(ctx, &commonProperties{})
		for axis, configToProps := range archVariantProps {
		for config, _props := range configToProps {
		if archProps, ok := _props.(*commonProperties); ok {
		_, requiredWithoutCycles := RemoveFromList(ctx.ModuleName(), archProps.Required)
		requiredWithoutCycles = FirstUniqueStrings(requiredWithoutCycles)
		required.SetSelectValue(axis, config, depsToLabelList(requiredWithoutCycles).Value)
		if !neitherHostNorDevice {
		if archProps.Enabled != nil {

bp2build/python_binary_conversion_test.go

+152 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ import (
		"testing"

		"android/soong/android"
		"android/soong/genrule"
		"android/soong/python"
		)

		@@ -12,6 +13,8 @@ func runBp2BuildTestCaseWithPythonLibraries(t *testing.T, tc Bp2buildTestCase) {
		RunBp2BuildTestCase(t, func(ctx android.RegistrationContext) {
		ctx.RegisterModuleType("python_library", python.PythonLibraryFactory)
		ctx.RegisterModuleType("python_library_host", python.PythonLibraryHostFactory)
		ctx.RegisterModuleType("genrule", genrule.GenRuleFactory)
		ctx.RegisterModuleType("python_defaults", python.DefaultsFactory)
		}, tc)
		}

		@@ -165,3 +168,152 @@ func TestPythonBinaryHostArchVariance(t *testing.T) {
		},
		})
		}

		func TestPythonBinaryMainIsNotSpecified(t *testing.T) {
		runBp2BuildTestCaseWithPythonLibraries(t, Bp2buildTestCase{
		Description: "python_binary_host main label in same package",
		ModuleTypeUnderTest: "python_binary_host",
		ModuleTypeUnderTestFactory: python.PythonBinaryHostFactory,
		Blueprint: `python_binary_host {
		name: "foo",
		bazel_module: { bp2build_available: true },
		}
		`,
		ExpectedBazelTargets: []string{
		MakeBazelTarget("py_binary", "foo", AttrNameToString{
		"imports": `["."]`,
		"target_compatible_with": `select({
		"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
		"//conditions:default": [],
		})`,
		}),
		},
		})
		}

		func TestPythonBinaryMainIsLabel(t *testing.T) {
		runBp2BuildTestCaseWithPythonLibraries(t, Bp2buildTestCase{
		Description: "python_binary_host main label in same package",
		ModuleTypeUnderTest: "python_binary_host",
		ModuleTypeUnderTestFactory: python.PythonBinaryHostFactory,
		Blueprint: `python_binary_host {
		name: "foo",
		main: ":a",
		bazel_module: { bp2build_available: true },
		}

		genrule {
		name: "a",
		bazel_module: { bp2build_available: false },
		}
		`,
		ExpectedBazelTargets: []string{
		MakeBazelTarget("py_binary", "foo", AttrNameToString{
		"main": `":a"`,
		"imports": `["."]`,
		"target_compatible_with": `select({
		"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
		"//conditions:default": [],
		})`,
		}),
		},
		})
		}

		func TestPythonBinaryMainIsSubpackageFile(t *testing.T) {
		runBp2BuildTestCaseWithPythonLibraries(t, Bp2buildTestCase{
		Description: "python_binary_host main is subpackage file",
		ModuleTypeUnderTest: "python_binary_host",
		ModuleTypeUnderTestFactory: python.PythonBinaryHostFactory,
		Filesystem: map[string]string{
		"a/Android.bp": "",
		"a/b.py": "",
		},
		Blueprint: `python_binary_host {
		name: "foo",
		main: "a/b.py",
		bazel_module: { bp2build_available: true },
		}

		`,
		ExpectedBazelTargets: []string{
		MakeBazelTarget("py_binary", "foo", AttrNameToString{
		"main": `"//a:b.py"`,
		"imports": `["."]`,
		"target_compatible_with": `select({
		"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
		"//conditions:default": [],
		})`,
		}),
		},
		})
		}

		func TestPythonBinaryMainIsSubDirFile(t *testing.T) {
		runBp2BuildTestCaseWithPythonLibraries(t, Bp2buildTestCase{
		Description: "python_binary_host main is file in sub directory that is not Bazel package",
		ModuleTypeUnderTest: "python_binary_host",
		ModuleTypeUnderTestFactory: python.PythonBinaryHostFactory,
		Filesystem: map[string]string{
		"a/b.py": "",
		},
		Blueprint: `python_binary_host {
		name: "foo",
		main: "a/b.py",
		bazel_module: { bp2build_available: true },
		}

		`,
		ExpectedBazelTargets: []string{
		MakeBazelTarget("py_binary", "foo", AttrNameToString{
		"main": `"a/b.py"`,
		"imports": `["."]`,
		"target_compatible_with": `select({
		"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
		"//conditions:default": [],
		})`,
		}),
		},
		})
		}

		func TestPythonBinaryDuplicatesInRequired(t *testing.T) {
		runBp2BuildTestCaseWithPythonLibraries(t, Bp2buildTestCase{
		Description: "python_binary_host duplicates in required attribute of the module and its defaults",
		ModuleTypeUnderTest: "python_binary_host",
		ModuleTypeUnderTestFactory: python.PythonBinaryHostFactory,
		Blueprint: `python_binary_host {
		name: "foo",
		main: "a.py",
		defaults: ["d"],
		required: [
		"r1",
		],
		bazel_module: { bp2build_available: true },
		}

		python_defaults {
		name: "d",
		required: [
		"r1",
		"r2",
		],
		}` + simpleModuleDoNotConvertBp2build("genrule", "r1") +
		simpleModuleDoNotConvertBp2build("genrule", "r2"),

		ExpectedBazelTargets: []string{
		MakeBazelTarget("py_binary", "foo", AttrNameToString{
		"main": `"a.py"`,
		"imports": `["."]`,
		"data": `[
		":r1",
		":r2",
		]`,
		"target_compatible_with": `select({
		"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
		"//conditions:default": [],
		})`,
		}),
		},
		})
		}

python/binary.go

+13 −13

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ func registerPythonBinaryComponents(ctx android.RegistrationContext) {
		}

		type bazelPythonBinaryAttributes struct {
		Main *string
		Main *bazel.Label
		Srcs bazel.LabelListAttribute
		Deps bazel.LabelListAttribute
		Python_version *string
		@@ -42,17 +42,6 @@ type bazelPythonBinaryAttributes struct {
		}

		func pythonBinaryBp2Build(ctx android.TopDownMutatorContext, m *Module) {
		var main *string
		for _, propIntf := range m.GetProperties() {
		if props, ok := propIntf.(*BinaryProperties); ok {
		// main is optional.
		if props.Main != nil {
		main = props.Main
		break
		}
		}
		}

		// TODO(b/182306917): this doesn't fully handle all nested props versioned
		// by the python version, which would have been handled by the version split
		// mutator. This is sufficient for very simple python_binary_host modules
		@@ -72,13 +61,24 @@ func pythonBinaryBp2Build(ctx android.TopDownMutatorContext, m *Module) {

		baseAttrs := m.makeArchVariantBaseAttributes(ctx)
		attrs := &bazelPythonBinaryAttributes{
		Main: main,
		Main: nil,
		Srcs: baseAttrs.Srcs,
		Deps: baseAttrs.Deps,
		Python_version: python_version,
		Imports: baseAttrs.Imports,
		}

		for _, propIntf := range m.GetProperties() {
		if props, ok := propIntf.(*BinaryProperties); ok {
		// main is optional.
		if props.Main != nil {
		main := android.BazelLabelForModuleSrcSingle(ctx, *props.Main)
		attrs.Main = &main
		break
		}
		}
		}

		props := bazel.BazelTargetModuleProperties{
		// Use the native py_binary rule.
		Rule_class: "py_binary",

python/defaults.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ import (
		)

		func init() {
		android.RegisterModuleType("python_defaults", defaultsFactory)
		android.RegisterModuleType("python_defaults", DefaultsFactory)
		}

		type Defaults struct {
		@@ -30,7 +30,7 @@ type Defaults struct {
		func (d *Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		}

		func defaultsFactory() android.Module {
		func DefaultsFactory() android.Module {
		module := &Defaults{}

		module.AddProperties(