From 497a09310b03ce1cde15895423dcc71e8b9de9ee Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Wed, 14 Jul 2021 16:35:33 +0100 Subject: Drop `strings.HasPrefix` when guarding `strings.TrimPrefix`. There is no need to check as `TrimPrefix` does nothing if the prefix doesn't match (see https://pkg.go.dev/strings#TrimPrefix). Bug: 193425964 Test: m nothing Change-Id: Ieb82e72a471800e29eb6bb54308041a9ab4173e5 --- java/java.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index be1ad874f..0770f7ffb 100644 --- a/java/java.go +++ b/java/java.go @@ -21,7 +21,6 @@ package java import ( "fmt" "path/filepath" - "strings" "github.com/google/blueprint" "github.com/google/blueprint/proptools" @@ -1462,11 +1461,7 @@ func (j *Import) IDECustomizedModuleName() string { // TODO(b/113562217): Extract the base module name from the Import name, often the Import name // has a prefix "prebuilt_". Remove the prefix explicitly if needed until we find a better // solution to get the Import name. - name := j.Name() - if strings.HasPrefix(name, removedPrefix) { - name = strings.TrimPrefix(name, removedPrefix) - } - return name + return android.RemoveOptionalPrebuiltPrefix(j.Name()) } var _ android.PrebuiltInterface = (*Import)(nil) -- cgit v1.2.3-59-g8ed1b