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

androidmk: convert stems prefixed with LOCAL_MODULE to suffix

Browse Source 
Convert stem: LOCAL_MODULE + "32" to suffix: "32"

Change-Id: I7126e814bd35f502196abc087b5d0afb825d3665
This commit is contained in:
Colin Cross
2015-05-08 16:06:22 -07:00
parent a93000350a
commit eae04e04ac
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
androidmk/cmd/androidmk/android.go
View File

@@ -18,7 +18,6 @@ var standardProperties = map[string]struct {
}{ }{
// String properties // String properties
"LOCAL_MODULE": {"name", bpparser.String}, "LOCAL_MODULE": {"name", bpparser.String},
"LOCAL_MODULE_STEM": {"stem", bpparser.String},
"LOCAL_MODULE_CLASS": {"class", bpparser.String}, "LOCAL_MODULE_CLASS": {"class", bpparser.String},
"LOCAL_CXX_STL": {"stl", bpparser.String}, "LOCAL_CXX_STL": {"stl", bpparser.String},
"LOCAL_STRIP_MODULE": {"strip", bpparser.String}, "LOCAL_STRIP_MODULE": {"strip", bpparser.String},
@@ -79,6 +78,7 @@ var rewriteProperties = map[string]struct {
}{ }{
"LOCAL_C_INCLUDES": {localIncludeDirs}, "LOCAL_C_INCLUDES": {localIncludeDirs},
"LOCAL_EXPORT_C_INCLUDE_DIRS": {exportIncludeDirs}, "LOCAL_EXPORT_C_INCLUDE_DIRS": {exportIncludeDirs},
"LOCAL_MODULE_STEM": {stem},
} }
func localAbsPath(value bpparser.Value) (*bpparser.Value, error) { func localAbsPath(value bpparser.Value) (*bpparser.Value, error) {
@@ -253,6 +253,22 @@ func exportIncludeDirs(file *bpFile, value *mkparser.MakeString, appendVariable
return nil return nil
} }
func stem(file *bpFile, value *mkparser.MakeString, appendVariable bool, class, suffix string) error {
val, err := makeVariableToBlueprint(file, value, bpparser.String)
if err != nil {
return err
}
varName := "stem"
if val.Expression != nil && val.Expression.Operator == '+' &&
val.Expression.Args[0].Variable == "LOCAL_MODULE" {
varName = "suffix"
val = &val.Expression.Args[1]
}
return setVariable(file, appendVariable, varName, val, true, class, suffix)
}
var deleteProperties = map[string]struct{}{ var deleteProperties = map[string]struct{}{
"LOCAL_CPP_EXTENSION": struct{}{}, "LOCAL_CPP_EXTENSION": struct{}{},
} }