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 am: b061c19fae am: 58e1a76367

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

Change-Id: I6aa65ce9a02f46ea09d9598aeb73796a432ed654
This commit is contained in:
Yifan Hong
2020-09-11 05:00:37 +00:00
committed by Automerger Merge Worker
parent 47a542c0fe 58e1a76367
commit 731da4e08d
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()
}
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
// For example, com.android.foo => COM_ANDROID_FOO
func makeDefineString(name string) string {
return strings.ReplaceAll(strings.ToUpper(name), ".", "_")
return invalidDefineCharRegex.ReplaceAllString(strings.ToUpper(name), "_")
}
var gnuToCReplacer = strings.NewReplacer("gnu", "c")