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

Remove LOCAL_CPP_EXTENSION during Android.mk translation

Browse source 
LOCAL_CPP_EXTENSION is unnecesary in soong, it can accept files
with .cc or .cpp extension.

Change-Id: I64cb37f199e25f1fed7e53144f85e52ba616529a
This commit is contained in:
Colin Cross 2015-03-18 12:08:31 -07:00
parent af19a29bb7
commit 70a255f3c9
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
androidmk/cmd/androidmk/android.go
View file

@ -56,6 +56,10 @@ var boolProperties = map[string]string{
"LOCAL_RTTI_FLAG": "rtti", "LOCAL_RTTI_FLAG": "rtti",
} }
var deleteProperties = map[string]struct{}{
"LOCAL_CPP_EXTENSION": struct{}{},
}
var propertySuffixes = []struct { var propertySuffixes = []struct {
suffix string suffix string
class string class string

2
androidmk/cmd/androidmk/androidmk.go
View file

@ -241,6 +241,8 @@ func handleAssignment(file *bpFile, assignment mkparser.Assignment, c *condition
err = setVariable(file, assignment.Value, assignment.Type == "+=", prop, bpparser.List, true, class, suffix) err = setVariable(file, assignment.Value, assignment.Type == "+=", prop, bpparser.List, true, class, suffix)
} else if prop, ok := boolProperties[name]; ok { } else if prop, ok := boolProperties[name]; ok {
err = setVariable(file, assignment.Value, assignment.Type == "+=", prop, bpparser.Bool, true, class, suffix) err = setVariable(file, assignment.Value, assignment.Type == "+=", prop, bpparser.Bool, true, class, suffix)
} else if _, ok := deleteProperties[name]; ok {
return
} else { } else {
if name == "LOCAL_PATH" { if name == "LOCAL_PATH" {
// Nothing to do, except maybe avoid the "./" in paths? // Nothing to do, except maybe avoid the "./" in paths?