Merge "Remove restriction on android config in generated rust_library targets" into main (59aa97a5) · Commits · e / os / android_build_soong

bp2build/rust_library_conversion_test.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -101,8 +101,7 @@ rust_library_host {
		`,
		},
		ExpectedBazelTargets: []string{
		// TODO(b/290790800): Remove the restriction when rust toolchain for android is implemented
		makeBazelTargetHostOrDevice("rust_library", "libfoo", expectedAttrs, android.HostSupported),
		MakeBazelTargetNoRestrictions("rust_library", "libfoo", expectedAttrs),
		makeBazelTargetHostOrDevice("rust_library", "libfoo_host", expectedAttrs, android.HostSupported),
		},
		},

+1 −6

Original line number	Diff line number	Diff line
		@@ -865,11 +865,7 @@ func libraryBp2build(ctx android.Bp2buildMutatorContext, m *Module) {
		},
		}

		// TODO(b/290790800): Remove the restriction when rust toolchain for android is implemented
		var restriction bazel.BoolAttribute
		restriction.SetSelectValue(bazel.OsConfigurationAxis, "android", proptools.BoolPtr(false))

		ctx.CreateBazelTargetModuleWithRestrictions(
		ctx.CreateBazelTargetModule(
		bazel.BazelTargetModuleProperties{
		Rule_class: "rust_library",
		Bzl_load_location: "@rules_rust//rust:defs.bzl",
		@@ -878,7 +874,6 @@ func libraryBp2build(ctx android.Bp2buildMutatorContext, m *Module) {
		Name: m.Name(),
		},
		attrs,
		restriction,
		)
		}