From fb8c5a54ea8b71d043ab8ee641f19fcdca33ab40 Mon Sep 17 00:00:00 2001 From: Vinh Tran Date: Thu, 12 Oct 2023 15:28:14 -0400 Subject: [PATCH] Remove restriction on android config in generated rust_library targets Bug: b/290790800 Test: b build //external/rust/crates/... --config=android Change-Id: Id06dc94f8bff519c09de7a0de0f1999cf310f599 --- bp2build/rust_library_conversion_test.go | 3 +-- rust/library.go | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/bp2build/rust_library_conversion_test.go b/bp2build/rust_library_conversion_test.go index 0bc80dfbb..09fc0ed33 100644 --- a/bp2build/rust_library_conversion_test.go +++ b/bp2build/rust_library_conversion_test.go @@ -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), }, }, diff --git a/rust/library.go b/rust/library.go index c59847365..2d5113b0e 100644 --- a/rust/library.go +++ b/rust/library.go @@ -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, ) }