Source release 16.4.0

third_party/gmock.gyp

@@ -1,22 +1,27 @@
 # Copyright 2013 Google Inc. All Rights Reserved.
 # This is for googletest release 1.8.0
 {
+  'variables': {
+    'dependent_included_warning_flags': [
+      '-Wno-unknown-warning-option',
+      '-Wno-deprecated-copy',
+    ],
+    'dependent_excluded_warning_flags': [
+      '-Wdeprecated-copy',
+      '-Werror=deprecated-copy',
+    ],
+  },
+
   'target_defaults': {
+    'includes': ['disable_warnings.gypi'],
     # It seems that if one target uses -fPIC, then all targets will need that
     # flag or else there will be linking errors.  PIC means Position Independent
     # Code and is needed to build the shared library version of liboemrypto.so.
-    # Similarly, -g is all or nothing.  It turns on debugging symbols.
     'cflags': [
-      '-g',
       '-fPIC',
     ],
     'cflags_cc': [
       '-std=c++11',
-      # gMock violates these warnings
-      '-Wno-deprecated-copy',
-    ],
-    'cflags_cc!': [
-      '-Wdeprecated-copy',
     ],
     'ldflags': [
       '-fPIC',
@@ -32,13 +37,11 @@
         'googletest/googlemock/include',
         'googletest/googletest/include',
       ],
-      'cflags_cc': [
-        # gMock's exported headers violate these warnings
-        '-Wno-deprecated-copy',
-      ],
-      'cflags_cc!': [
-        '-Wdeprecated-copy',
-      ],
+      # gMock & gTest's exported headers fail these warnings
+      'cflags': ['<@(dependent_included_warning_flags)'],
+      'cflags!': ['<@(dependent_excluded_warning_flags)'],
+      'cflags_c!': ['<@(dependent_excluded_warning_flags)'],
+      'cflags_cc!': ['<@(dependent_excluded_warning_flags)'],
       'xcode_settings': {
         'OTHER_CFLAGS': [
           '-Wno-inconsistent-missing-override',