Remove __bp2build__ prefix trimming.
This is no longer needed after r.android.com/1792714
Test: CI
Change-Id: I808c3124cf1a4f3ebe5d25e41f346a818c3cc57c
diff --git a/bp2build/build_conversion.go b/bp2build/build_conversion.go
index 10e2329..2cbb557 100644
--- a/bp2build/build_conversion.go
+++ b/bp2build/build_conversion.go
@@ -153,10 +153,10 @@
}
type CodegenContext struct {
- config android.Config
- context android.Context
- mode CodegenMode
- additionalDeps []string
+ config android.Config
+ context android.Context
+ mode CodegenMode
+ additionalDeps []string
unconvertedDepMode unconvertedDepsMode
}
@@ -710,10 +710,6 @@
return strings.Repeat(" ", indent)
}
-func targetNameForBp2Build(c bpToBuildContext, logicModule blueprint.Module) string {
- return strings.Replace(c.ModuleName(logicModule), bazel.BazelTargetModuleNamePrefix, "", 1)
-}
-
func targetNameWithVariant(c bpToBuildContext, logicModule blueprint.Module) string {
name := ""
if c.ModuleSubDir(logicModule) != "" {
diff --git a/bp2build/compatibility.go b/bp2build/compatibility.go
index 5baa524..01dbdb9 100644
--- a/bp2build/compatibility.go
+++ b/bp2build/compatibility.go
@@ -1,7 +1,6 @@
package bp2build
import (
- "android/soong/bazel"
"fmt"
)
@@ -16,9 +15,6 @@
// Log an entry of module name -> Bazel target label.
func (compatLayer CodegenCompatLayer) AddNameToLabelEntry(name, label string) {
- // The module name may be prefixed with bazel.BazelTargetModuleNamePrefix if
- // generated from bp2build.
- name = bazel.StripNamePrefix(name)
if existingLabel, ok := compatLayer.NameToLabelMap[name]; ok {
panic(fmt.Errorf(
"Module '%s' maps to more than one Bazel target label: %s, %s. "+