StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Drop strings.HasPrefix when guarding strings.TrimPrefix."

Browse Source
This commit is contained in:
Ulyana Trafimovich
2021-07-15 10:15:26 +00:00
committed by Gerrit Code Review
parent 4e444dab84 497a09310b
commit 7beb099546
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java.go
View File

@@ -21,7 +21,6 @@ package java
import ( import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"strings"
"github.com/google/blueprint" "github.com/google/blueprint"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
@@ -1465,11 +1464,7 @@ func (j *Import) IDECustomizedModuleName() string {
// TODO(b/113562217): Extract the base module name from the Import name, often the Import name // 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 // has a prefix "prebuilt_". Remove the prefix explicitly if needed until we find a better
// solution to get the Import name. // solution to get the Import name.
name := j.Name() return android.RemoveOptionalPrebuiltPrefix(j.Name())
if strings.HasPrefix(name, removedPrefix) {
name = strings.TrimPrefix(name, removedPrefix)
}
return name
} }
var _ android.PrebuiltInterface = (*Import)(nil) var _ android.PrebuiltInterface = (*Import)(nil)

2
java/robolectric.go
View File

@@ -179,7 +179,7 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext)
continue continue
} else if strings.HasSuffix(s, "/BaseRobolectricTest.java") { } else if strings.HasSuffix(s, "/BaseRobolectricTest.java") {
continue continue
} else if strings.HasPrefix(s, "src/") { } else {
s = strings.TrimPrefix(s, "src/") s = strings.TrimPrefix(s, "src/")
} }
r.tests = append(r.tests, s) r.tests = append(r.tests, s)