Add m-esr52 at 52.6.0

4 files changed, 31 insertions, 0 deletions

diff --git a/media/webrtc/trunk/tools/gyp/test/no-cpp/src/call-f-main.c b/media/webrtc/trunk/tools/gyp/test/no-cpp/src/call-f-main.c
new file mode 100644
index 000000000..8b95c5910
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/no-cpp/src/call-f-main.c
@@ -0,0 +1,2 @@
+void* f();
+int main() { f(); }
diff --git a/media/webrtc/trunk/tools/gyp/test/no-cpp/src/empty-main.c b/media/webrtc/trunk/tools/gyp/test/no-cpp/src/empty-main.c
new file mode 100644
index 000000000..237c8ce18
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/no-cpp/src/empty-main.c
@@ -0,0 +1 @@
+int main() {}
diff --git a/media/webrtc/trunk/tools/gyp/test/no-cpp/src/f.cc b/media/webrtc/trunk/tools/gyp/test/no-cpp/src/f.cc
new file mode 100644
index 000000000..02f50f21a
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/no-cpp/src/f.cc
@@ -0,0 +1,3 @@
+extern "C" { void* f(); }
+
+void* f() { return new int; }
diff --git a/media/webrtc/trunk/tools/gyp/test/no-cpp/src/test.gyp b/media/webrtc/trunk/tools/gyp/test/no-cpp/src/test.gyp
new file mode 100644
index 000000000..417015ec8
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/no-cpp/src/test.gyp
@@ -0,0 +1,25 @@
+# Copyright (c) 2013 Google Inc. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'targets': [
+    {
+      'target_name': 'no_cpp',
+      'type': 'executable',
+      'sources': [ 'empty-main.c' ],
+    },
+    # A static_library with a cpp file and a linkable with only .c files
+    # depending on it causes a linker error:
+    {
+      'target_name': 'cpp_lib',
+      'type': 'static_library',
+      'sources': [ 'f.cc' ],
+    },
+    {
+      'target_name': 'no_cpp_dep_on_cc_lib',
+      'type': 'executable',
+      'dependencies': [ 'cpp_lib' ],
+      'sources': [ 'call-f-main.c' ],
+    },
+  ],
+}