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

Merge "Treat .cxx files as c++" am: 35bb770e0e am: 6598f20be5

Browse Source 
am: d3c8c1ed26

Change-Id: I712a1e0077be38ea18f19381c69f1b664aa0244b
This commit is contained in:
Colin Cross
2019-06-28 14:33:48 -07:00
committed by android-build-merger
parent 59a8ad3bb2 d3c8c1ed26
commit 0635369d36
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"
moduleCflags = cflags
moduleToolingCflags = toolingCflags
case ".cpp", ".cc", ".mm":
case ".cpp", ".cc", ".cxx", ".mm":
ccCmd = "clang++"
moduleCflags = cppflags
moduleToolingCflags = toolingCppflags

2
cc/compdb.go
View File

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