Merge "Treat .cxx files as c++"
am: 35bb770e0e
Change-Id: I18b67e43e531aa989bd1f5312808c98bc619063a
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user