Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3c8c1ed authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

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

am: 6598f20b

Change-Id: Ib62c7134007c7e7ed9d838a377261c9b3d169213
parents cbcb8675 6598f20b

cc/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -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

cc/compdb.go

+1 −1
Original line number Diff line number Diff line
@@ -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