commit 16d90a8954547d624597b05068de05374489f123
author Jingwen Chen <jingwen@google.com> Fri Sep 17 07:16:13 2021 +0000
committer Jingwen Chen <jingwen@google.com> Fri Sep 17 07:16:59 2021 +0000
tree 198cbfb5a90fa6297307b78adaee44766cc7f1a1
parent ac5097fcf4cdc14932b21b92c7c99b125c7efac7

Remove __bp2build__ prefix trimming.

This is no longer needed after r.android.com/1792714

Test: CI
Change-Id: I808c3124cf1a4f3ebe5d25e41f346a818c3cc57c

bp2build/build_conversion.go

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) != "" {