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

Merge "Treat .cxx files as c++"

Browse Source
This commit is contained in:
Treehugger Robot
2019-06-28 20:43:33 +00:00
committed by Gerrit Code Review
parent 4190926e61 d34ab7c6b2
commit 35bb770e0e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/builder.go
View File

@@ -416,7 +416,7 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and
ccCmd = "clang" ccCmd = "clang"
moduleCflags = cflags moduleCflags = cflags
moduleToolingCflags = toolingCflags moduleToolingCflags = toolingCflags
case ".cpp", ".cc", ".mm": case ".cpp", ".cc", ".cxx", ".mm":
ccCmd = "clang++" ccCmd = "clang++"
moduleCflags = cppflags moduleCflags = cppflags
moduleToolingCflags = toolingCppflags moduleToolingCflags = toolingCppflags

2
cc/compdb.go
View File

@@ -141,7 +141,7 @@ func getArguments(src android.Path, ctx android.SingletonContext, ccModule *Modu
isAsm = false isAsm = false
isCpp = false isCpp = false
clangPath = ccPath clangPath = ccPath
case ".cpp", ".cc", ".mm": case ".cpp", ".cc", ".cxx", ".mm":
isAsm = false isAsm = false
isCpp = true isCpp = true
clangPath = cxxPath clangPath = cxxPath