[NaCl SDK] Don't include gtest/gmock in library form

native_client_sdk/src/libraries/gmock/library.dsc

Index: native_client_sdk/src/libraries/gmock/library.dsc
diff --git a/native_client_sdk/src/libraries/gmock/library.dsc b/native_client_sdk/src/libraries/gmock/library.dsc
index 0a268a2c6db59cb4c017048d9de7f7e3687118fa..71c5c47499b9b2539f58282c8094c8f669f9530c 100644
--- a/native_client_sdk/src/libraries/gmock/library.dsc
+++ b/native_client_sdk/src/libraries/gmock/library.dsc
@@ -1,64 +1,38 @@
 {
-  'SEARCH': [
-    '../../../../testing/gmock/include/gmock',
-    '../../../../testing/gmock/include/gmock/internal',
-    '../../../../testing/gmock/src',
-  ],
-  'TARGETS': [
-    {
-      'NAME' : 'gmock',
-      'TYPE' : 'lib',
-      'SOURCES' : [
-        'gmock.cc',
-        'gmock-matchers.cc',
-        'gmock-cardinalities.cc',
-        'gmock-internal-utils.cc',
-        'gmock-spec-builders.cc',
-      ],
       #   gmock-spec-builders.cc:248: error: enumeration value ‘FAIL’ not handled in switch
-      'CXXFLAGS': ['-Wno-switch-enum'],
-      'DEPS': ['gtest'],
-    }
+      #'CXXFLAGS': ['-Wno-switch-enum'],
+  'SEARCH': [
+    '../../../../testing/gmock',
   ],
-  'HEADERS': [
-    {
-      'FILES': [
-        'gmock-actions.h',
-        'gmock-cardinalities.h',
-        'gmock-generated-actions.h',
-        'gmock-generated-actions.h.pump',
-        'gmock-generated-function-mockers.h',
-        'gmock-generated-function-mockers.h.pump',
-        'gmock-generated-matchers.h',
-        'gmock-generated-matchers.h.pump',
-        'gmock-generated-nice-strict.h',
-        'gmock-generated-nice-strict.h.pump',
-        'gmock.h',
-        'gmock-matchers.h',
-        'gmock-more-actions.h',
-        'gmock-more-matchers.h',
-        'gmock-spec-builders.h',
-      ],
-      'DEST': 'include/gmock',
-    },
-    {
-      'FILES': [
-        'gmock-generated-internal-utils.h',
-        'gmock-generated-internal-utils.h.pump',
-        'gmock-internal-utils.h',
-        'gmock-port.h',
-      ],
-      'DEST': 'include/gmock/internal',
-    },
-    {
-      'FILES': [
-        'gmock.h',
-        'gmock-generated-actions.h',
-        'gmock-matchers.h',
-        'gmock-port.h',
-      ],
-      'DEST': 'include/gmock/internal/custom',
-    },
+  'DATA': [
+    'src/gmock.cc',
+    'src/gmock-all.cc',
+    'src/gmock-matchers.cc',
+    'src/gmock-cardinalities.cc',
+    'src/gmock-internal-utils.cc',
+    'src/gmock-spec-builders.cc',
+    'include/gmock/gmock-actions.h',
+    'include/gmock/gmock-cardinalities.h',
+    'include/gmock/gmock-generated-actions.h',
+    'include/gmock/gmock-generated-actions.h.pump',
+    'include/gmock/gmock-generated-function-mockers.h',
+    'include/gmock/gmock-generated-function-mockers.h.pump',
+    'include/gmock/gmock-generated-matchers.h',
+    'include/gmock/gmock-generated-matchers.h.pump',
+    'include/gmock/gmock-generated-nice-strict.h',
+    'include/gmock/gmock-generated-nice-strict.h.pump',
+    'include/gmock/gmock.h',
+    'include/gmock/gmock-matchers.h',
+    'include/gmock/gmock-more-actions.h',
+    'include/gmock/gmock-more-matchers.h',
+    'include/gmock/gmock-spec-builders.h',
+    'include/gmock/internal/gmock-generated-internal-utils.h',
+    'include/gmock/internal/gmock-generated-internal-utils.h.pump',
+    'include/gmock/internal/gmock-internal-utils.h',
+    'include/gmock/internal/gmock-port.h',
+    'include/gmock/internal/custom/gmock-generated-actions.h',
+    'include/gmock/internal/custom/gmock-matchers.h',
+    'include/gmock/internal/custom/gmock-port.h',
   ],
   'DEST': 'src',
   'NAME': 'gmock',