tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use android.InList for inList" am: e35ad13004 am: 20b350b433

Browse source 
am: 3ef40fd3e4

Change-Id: Iaf540c0d55cbbf9780fcf2721f0a67de43902948
This commit is contained in:
Colin Cross 2018-02-22 04:20:12 +00:00 committed by android-build-merger
commit aa008b4cb2
2 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cc/config/toolchain.go
View file

@ -199,20 +199,6 @@ func addPrefix(list []string, prefix string) []string {
return list
}
func indexList(s string, list []string) int {
for i, l := range list {
if l == s {
return i
}
}
return -1
}
func inList(s string, list []string) bool {
return indexList(s, list) != -1
}
func SanitizerRuntimeLibrary(t Toolchain, sanitizer string) string {
arch := t.SanitizerRuntimeLibraryArch()
if arch == "" {
@ -243,3 +229,5 @@ func ToolPath(t Toolchain) string {
}
return filepath.Join(t.GccRoot(), t.GccTriple(), "bin")
}
var inList = android.InList

10
java/java.go
View file

@ -1252,15 +1252,6 @@ func ImportFactoryHost() android.Module {
return module
}
func inList(s string, l []string) bool {
for _, e := range l {
if e == s {
return true
}
}
return false
}
//
// Defaults
//
@ -1295,3 +1286,4 @@ func DefaultsFactory(props ...interface{}) android.Module {
var Bool = proptools.Bool
var String = proptools.String
var inList = android.InList