Add m-esr52 at 52.6.0

10 files changed, 86 insertions, 0 deletions

diff --git a/media/webrtc/trunk/tools/gyp/test/include_dirs/src/inc.h b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/inc.h
new file mode 100644
index 000000000..0398d6915
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/inc.h
@@ -0,0 +1 @@
+#define INC_STRING "inc.h"
diff --git a/media/webrtc/trunk/tools/gyp/test/include_dirs/src/inc1/include1.h b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/inc1/include1.h
new file mode 100644
index 000000000..43356b5f4
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/inc1/include1.h
@@ -0,0 +1 @@
+#define INCLUDE1_STRING "include1.h"
diff --git a/media/webrtc/trunk/tools/gyp/test/include_dirs/src/includes.c b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/includes.c
new file mode 100644
index 000000000..6e2a23cdf
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/includes.c
@@ -0,0 +1,19 @@
+#include <stdio.h>
+
+#include "inc.h"
+#include "include1.h"
+#include "include2.h"
+#include "shadow.h"
+
+int main(void)
+{
+  printf("Hello from includes.c\n");
+  printf("Hello from %s\n", INC_STRING);
+  printf("Hello from %s\n", INCLUDE1_STRING);
+  printf("Hello from %s\n", INCLUDE2_STRING);
+  /* Test that include_dirs happen first: The gyp file has a -Ishadow1
+     cflag and an include_dir of shadow2.  Including shadow.h should get
+     the shadow.h from the include_dir. */
+  printf("Hello from %s\n", SHADOW_STRING);
+  return 0;
+}
diff --git a/media/webrtc/trunk/tools/gyp/test/include_dirs/src/includes.gyp b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/includes.gyp
new file mode 100644
index 000000000..359269020
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/includes.gyp
@@ -0,0 +1,27 @@
+# Copyright (c) 2009 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': 'includes',
+      'type': 'executable',
+      'dependencies': [
+        'subdir/subdir_includes.gyp:subdir_includes',
+      ],
+      'cflags': [
+        '-Ishadow1',
+      ],
+      'include_dirs': [
+        '.',
+        'inc1',
+        'shadow2',
+        'subdir/inc2',
+      ],
+      'sources': [
+        'includes.c',
+      ],
+    },
+  ],
+}
diff --git a/media/webrtc/trunk/tools/gyp/test/include_dirs/src/shadow1/shadow.h b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/shadow1/shadow.h
new file mode 100644
index 000000000..80f6de20b
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/shadow1/shadow.h
@@ -0,0 +1 @@
+#define SHADOW_STRING "shadow1/shadow.h"
diff --git a/media/webrtc/trunk/tools/gyp/test/include_dirs/src/shadow2/shadow.h b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/shadow2/shadow.h
new file mode 100644
index 000000000..fad5ccd08
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/shadow2/shadow.h
@@ -0,0 +1 @@
+#define SHADOW_STRING "shadow2/shadow.h"
diff --git a/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/inc.h b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/inc.h
new file mode 100644
index 000000000..0a68d7b36
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/inc.h
@@ -0,0 +1 @@
+#define INC_STRING "subdir/inc.h"
diff --git a/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/inc2/include2.h b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/inc2/include2.h
new file mode 100644
index 000000000..721577eff
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/inc2/include2.h
@@ -0,0 +1 @@
+#define INCLUDE2_STRING "subdir/inc2/include2.h"
diff --git a/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/subdir_includes.c b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/subdir_includes.c
new file mode 100644
index 000000000..4623543c4
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/subdir_includes.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+
+#include "inc.h"
+#include "include1.h"
+#include "include2.h"
+
+int main(void)
+{
+  printf("Hello from subdir/subdir_includes.c\n");
+  printf("Hello from %s\n", INC_STRING);
+  printf("Hello from %s\n", INCLUDE1_STRING);
+  printf("Hello from %s\n", INCLUDE2_STRING);
+  return 0;
+}
diff --git a/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/subdir_includes.gyp b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/subdir_includes.gyp
new file mode 100644
index 000000000..257d052c3
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/include_dirs/src/subdir/subdir_includes.gyp
@@ -0,0 +1,20 @@
+# Copyright (c) 2009 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': 'subdir_includes',
+      'type': 'executable',
+      'include_dirs': [
+        '.',
+        '../inc1',
+        'inc2',
+      ],
+      'sources': [
+        'subdir_includes.c',
+      ],
+    },
+  ],
+}