diff options
| author | Colin Cross <ccross@android.com> | 2015-03-18 12:08:31 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-03-19 10:51:40 -0700 |
| commit | 70a255f3c9f9f549740befff8f3ec1974102df5e (patch) | |
| tree | 2bbb39756a6cd362064aff53c99a16e3a4b5fcca /androidmk | |
| parent | af19a29bb709d14acbbb112165b69657bb06e88c (diff) | |
| download | build_soong-70a255f3c9f9f549740befff8f3ec1974102df5e.tar.gz build_soong-70a255f3c9f9f549740befff8f3ec1974102df5e.tar.bz2 build_soong-70a255f3c9f9f549740befff8f3ec1974102df5e.zip | |
Remove LOCAL_CPP_EXTENSION during Android.mk translation
LOCAL_CPP_EXTENSION is unnecesary in soong, it can accept files
with .cc or .cpp extension.
Change-Id: I64cb37f199e25f1fed7e53144f85e52ba616529a
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 4 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk.go | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 48905a7d..5544dfde 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -56,6 +56,10 @@ var boolProperties = map[string]string{ "LOCAL_RTTI_FLAG": "rtti", } +var deleteProperties = map[string]struct{}{ + "LOCAL_CPP_EXTENSION": struct{}{}, +} + var propertySuffixes = []struct { suffix string class string diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go index 6695181b..fd31a138 100644 --- a/androidmk/cmd/androidmk/androidmk.go +++ b/androidmk/cmd/androidmk/androidmk.go @@ -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) } else if prop, ok := boolProperties[name]; ok { err = setVariable(file, assignment.Value, assignment.Type == "+=", prop, bpparser.Bool, true, class, suffix) + } else if _, ok := deleteProperties[name]; ok { + return } else { if name == "LOCAL_PATH" { // Nothing to do, except maybe avoid the "./" in paths? |