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

Merge "Sanitize APEX module name properly." am: c2c2d4e716 am: 18a051adfd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423412

Change-Id: I58d10eef190545b2a954efb76ef4fd7e1da24810
This commit is contained in:
Yifan Hong
2020-09-11 02:20:06 +00:00
committed by Automerger Merge Worker
parent 4198dc431f 18a051adfd
commit b061c19fae
1 changed files with 3 additions and 1 deletions
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")