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

Merge "Sanitize APEX module name properly."

Browse source
This commit is contained in:
Yifan Hong 2020-09-11 00:25:29 +00:00 committed by Gerrit Code Review
commit c2c2d4e716
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cc/compiler.go
View file

@ -573,10 +573,12 @@ func (compiler *baseCompiler) uniqueApexVariations() bool {
return compiler.useApexNameMacro() return compiler.useApexNameMacro()
} }
var invalidDefineCharRegex = regexp.MustCompile("[^a-zA-Z0-9_]")
// makeDefineString transforms a name of an APEX module into a value to be used as value for C define // makeDefineString transforms a name of an APEX module into a value to be used as value for C define
// For example, com.android.foo => COM_ANDROID_FOO // For example, com.android.foo => COM_ANDROID_FOO
func makeDefineString(name string) string { func makeDefineString(name string) string {
return strings.ReplaceAll(strings.ToUpper(name), ".", "_") return invalidDefineCharRegex.ReplaceAllString(strings.ToUpper(name), "_")
} }
var gnuToCReplacer = strings.NewReplacer("gnu", "c") var gnuToCReplacer = strings.NewReplacer("gnu", "c")