From d34ab7c6b2825dc01d5ad585726c99a0a2609721 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 27 Jun 2019 14:46:10 -0700
Subject: [PATCH] Treat .cxx files as c++

Fixes: 135749365
Fixes: 135667566
Test: m checkbuild
Change-Id: If47274812dfe781ebbb9f8a60a395650573727d5
---
 cc/builder.go | 2 +-
 cc/compdb.go  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cc/builder.go b/cc/builder.go
index 1e1236173..ee4073607 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -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
diff --git a/cc/compdb.go b/cc/compdb.go
index 110265174..ecc67b8b0 100644
--- a/cc/compdb.go
+++ b/cc/compdb.go
@@ -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