commit d34ab7c6b2825dc01d5ad585726c99a0a2609721
author Colin Cross <ccross@android.com> Thu Jun 27 14:46:10 2019 -0700
committer Colin Cross <ccross@android.com> Thu Jun 27 14:46:10 2019 -0700
tree 34c2c1d2c1316cf1c1cccc4358a2857425744f21
parent 8a255acae24bd839c77e59d5196ec8931bb5b20b

Treat .cxx files as c++

Fixes: 135749365
Fixes: 135667566
Test: m checkbuild
Change-Id: If47274812dfe781ebbb9f8a60a395650573727d5

cc/builder.go

diff --git a/cc/builder.go b/cc/builder.go
index 1e12361..ee40736 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -416,7 +416,7 @@
 			ccCmd = "clang"
 			moduleCflags = cflags
 			moduleToolingCflags = toolingCflags
-		case ".cpp", ".cc", ".mm":
+		case ".cpp", ".cc", ".cxx", ".mm":
 			ccCmd = "clang++"
 			moduleCflags = cppflags
 			moduleToolingCflags = toolingCppflags

cc/compdb.go

diff --git a/cc/compdb.go b/cc/compdb.go
index 1102651..ecc67b8 100644
--- a/cc/compdb.go
+++ b/cc/compdb.go
@@ -141,7 +141,7 @@
 		isAsm = false
 		isCpp = false
 		clangPath = ccPath
-	case ".cpp", ".cc", ".mm":
+	case ".cpp", ".cc", ".cxx", ".mm":
 		isAsm = false
 		isCpp = true
 		clangPath = cxxPath