# HG changeset patch
# User prr
# Date 1442253415 25200
# Node ID fc5205c29b31247961f12ca6a1081e50d4f82294
# Parent  18cbcab4b68f668d93771198d43130c6bb9b8fde
8136397: Build should recognise .cc file extension
Reviewed-by: ihse

diff -r 18cbcab4b68f -r fc5205c29b31 make/common/NativeCompilation.gmk
--- a/make/common/NativeCompilation.gmk	Mon Sep 14 09:33:37 2015 -0700
+++ b/make/common/NativeCompilation.gmk	Mon Sep 14 10:56:55 2015 -0700
@@ -102,7 +102,7 @@
 ################################################################################
 
 # Extensions of files handled by this macro.
-NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.m %.mm
+NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.cc %.m %.mm
 
 # Replaces native source extensions with the object file extension in a string.
 # Param 1: the string containing source file names with extensions
@@ -167,7 +167,7 @@
     $1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"'
     $1_$2_COMP=$(AS)
     $1_$2_DEP_FLAG:=
-  else ifneq (,$$(filter %.cpp,$2)$$(filter %.mm,$2))
+  else ifneq (,$$(filter %.cpp,$2)$$(filter %.cc,$2)$$(filter %.mm,$2))
     # Compile as a C++ or Objective-C++ file
     $1_$2_FLAGS=$(CFLAGS_CCACHE) $6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
     $1_$2_COMP=$7