commit 6598f20be5e6c7262a81cf822bf59388d9e0e15e
author Colin Cross <ccross@android.com> Fri Jun 28 14:21:47 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 28 14:21:47 2019 -0700
tree 19f7bd32e3d3d428ae0eaa6c7245e88023add95b
parent b9156584368f7d55479e37dbf21ce8b3fc4af988
parent 35bb770e0ebe8b748467142e144eb3b34b224b91

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

Change-Id: I18b67e43e531aa989bd1f5312808c98bc619063a

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