Source release v3.5.0

third_party/gmock.gyp

@@ -2,7 +2,20 @@
 # This is for googletest release 1.8.0
 {
   'target_defaults': {
-    'type': 'static_library',
+    # 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=gnu++98',
+    ],
+    'ldflags': [
+      '-fPIC',
+    ],
     'include_dirs': [
       'googletest/googlemock',
       'googletest/googlemock/include',
@@ -15,38 +28,25 @@
         'googletest/googletest/include',
       ],
     },
-    # These flags silence warnings that appear in gtest/gmock upstream.
-    # We will not maintain a divergent copy of gmock to fix them.
-    'cflags': [
-      # Ignore unknown warning options, to support both gcc & clang at once.
-      '-Wno-unknown-warning-option',
-    ],
-    'cflags_cc': [
-      '-Wno-sign-compare',
-      #'-Wno-unused-const-variable',
-      #'-Wno-unused-function',
-      #'-Wno-unused-parameter',
-      #'-Wno-shadow',
-      '-Wno-conversion',
-      '-Wno-sign-conversion',
-      #'-Wno-useless-cast',
-    ],
   },
   'targets': [
     {
       'target_name': 'gmock',
+      'type': 'static_library',
       'sources': [
         'googletest/googlemock/src/gmock-all.cc',
       ],
     },
     {
       'target_name': 'gmock_main',
+      'type': 'static_library',
       'sources': [
         'googletest/googlemock/src/gmock_main.cc',
       ],
     },
     {
       'target_name': 'gtest',
+      'type': 'static_library',
       'sources': [
         'googletest/googletest/src/gtest-all.cc',
       ],