[core] upgrade gyp to git commit 6fb8bd8

https://chromium.googlesource.com/external/gyp/+/6fb8bd829f0ca8fd432fd85ede788b6881c4f09f

18 files changed, 197 insertions, 0 deletions

diff --git a/deps/gyp/test/generator-output/src/build/README.txt b/deps/gyp/test/generator-output/src/build/README.txt
new file mode 100644
index 0000000000..90ef886193
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/build/README.txt
@@ -0,0 +1,4 @@
+A place-holder for this Xcode build output directory, so that the
+test script can verify that .xcodeproj files are not created in
+their normal location by making the src/ read-only, and then
+selectively making this build directory writable.
diff --git a/deps/gyp/test/generator-output/src/inc.h b/deps/gyp/test/generator-output/src/inc.h
new file mode 100644
index 0000000000..57aa1a5a74
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/inc.h
@@ -0,0 +1 @@
+#define INC_STRING      "inc.h"
diff --git a/deps/gyp/test/generator-output/src/inc1/include1.h b/deps/gyp/test/generator-output/src/inc1/include1.h
new file mode 100644
index 0000000000..1d59065fc9
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/inc1/include1.h
@@ -0,0 +1 @@
+#define INCLUDE1_STRING "inc1/include1.h"
diff --git a/deps/gyp/test/generator-output/src/prog1.c b/deps/gyp/test/generator-output/src/prog1.c
new file mode 100644
index 0000000000..bf7c2a17bd
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/prog1.c
@@ -0,0 +1,18 @@
+#include <stdio.h>
+
+#include "inc.h"
+#include "include1.h"
+#include "include2.h"
+#include "include3.h"
+#include "deeper.h"
+
+int main(void)
+{
+  printf("Hello from prog1.c\n");
+  printf("Hello from %s\n", INC_STRING);
+  printf("Hello from %s\n", INCLUDE1_STRING);
+  printf("Hello from %s\n", INCLUDE2_STRING);
+  printf("Hello from %s\n", INCLUDE3_STRING);
+  printf("Hello from %s\n", DEEPER_STRING);
+  return 0;
+}
diff --git a/deps/gyp/test/generator-output/src/prog1.gyp b/deps/gyp/test/generator-output/src/prog1.gyp
new file mode 100644
index 0000000000..d50e6fb0a7
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/prog1.gyp
@@ -0,0 +1,28 @@
+# 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.
+
+{
+  'includes': [
+    'symroot.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'prog1',
+      'type': 'executable',
+      'dependencies': [
+        'subdir2/prog2.gyp:prog2',
+      ],
+      'include_dirs': [
+        '.',
+        'inc1',
+        'subdir2/inc2',
+        'subdir3/inc3',
+        'subdir2/deeper',
+      ],
+      'sources': [
+        'prog1.c',
+      ],
+    },
+  ],
+}
diff --git a/deps/gyp/test/generator-output/src/subdir2/build/README.txt b/deps/gyp/test/generator-output/src/subdir2/build/README.txt
new file mode 100644
index 0000000000..90ef886193
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir2/build/README.txt
@@ -0,0 +1,4 @@
+A place-holder for this Xcode build output directory, so that the
+test script can verify that .xcodeproj files are not created in
+their normal location by making the src/ read-only, and then
+selectively making this build directory writable.
diff --git a/deps/gyp/test/generator-output/src/subdir2/deeper/build/README.txt b/deps/gyp/test/generator-output/src/subdir2/deeper/build/README.txt
new file mode 100644
index 0000000000..90ef886193
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir2/deeper/build/README.txt
@@ -0,0 +1,4 @@
+A place-holder for this Xcode build output directory, so that the
+test script can verify that .xcodeproj files are not created in
+their normal location by making the src/ read-only, and then
+selectively making this build directory writable.
diff --git a/deps/gyp/test/generator-output/src/subdir2/deeper/deeper.c b/deps/gyp/test/generator-output/src/subdir2/deeper/deeper.c
new file mode 100644
index 0000000000..843505cd11
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir2/deeper/deeper.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main(void)
+{
+  printf("Hello from deeper.c\n");
+  return 0;
+}
diff --git a/deps/gyp/test/generator-output/src/subdir2/deeper/deeper.gyp b/deps/gyp/test/generator-output/src/subdir2/deeper/deeper.gyp
new file mode 100644
index 0000000000..8648770872
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir2/deeper/deeper.gyp
@@ -0,0 +1,18 @@
+# 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.
+
+{
+  'includes': [
+    '../../symroot.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'deeper',
+      'type': 'executable',
+      'sources': [
+        'deeper.c',
+      ],
+    },
+  ],
+}
diff --git a/deps/gyp/test/generator-output/src/subdir2/deeper/deeper.h b/deps/gyp/test/generator-output/src/subdir2/deeper/deeper.h
new file mode 100644
index 0000000000..f6484a0fe5
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir2/deeper/deeper.h
@@ -0,0 +1 @@
+#define DEEPER_STRING   "subdir2/deeper/deeper.h"
diff --git a/deps/gyp/test/generator-output/src/subdir2/inc2/include2.h b/deps/gyp/test/generator-output/src/subdir2/inc2/include2.h
new file mode 100644
index 0000000000..1ccfa5dea7
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir2/inc2/include2.h
@@ -0,0 +1 @@
+#define INCLUDE2_STRING "inc2/include2.h"
diff --git a/deps/gyp/test/generator-output/src/subdir2/prog2.c b/deps/gyp/test/generator-output/src/subdir2/prog2.c
new file mode 100644
index 0000000000..d80d871984
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir2/prog2.c
@@ -0,0 +1,18 @@
+#include <stdio.h>
+
+#include "inc.h"
+#include "include1.h"
+#include "include2.h"
+#include "include3.h"
+#include "deeper.h"
+
+int main(void)
+{
+  printf("Hello from prog2.c\n");
+  printf("Hello from %s\n", INC_STRING);
+  printf("Hello from %s\n", INCLUDE1_STRING);
+  printf("Hello from %s\n", INCLUDE2_STRING);
+  printf("Hello from %s\n", INCLUDE3_STRING);
+  printf("Hello from %s\n", DEEPER_STRING);
+  return 0;
+}
diff --git a/deps/gyp/test/generator-output/src/subdir2/prog2.gyp b/deps/gyp/test/generator-output/src/subdir2/prog2.gyp
new file mode 100644
index 0000000000..7176ed8be7
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir2/prog2.gyp
@@ -0,0 +1,28 @@
+# 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.
+
+{
+  'includes': [
+    '../symroot.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'prog2',
+      'type': 'executable',
+      'include_dirs': [
+        '..',
+        '../inc1',
+        'inc2',
+        '../subdir3/inc3',
+        'deeper',
+      ],
+      'dependencies': [
+        '../subdir3/prog3.gyp:prog3',
+      ],
+      'sources': [
+        'prog2.c',
+      ],
+    },
+  ],
+}
diff --git a/deps/gyp/test/generator-output/src/subdir3/build/README.txt b/deps/gyp/test/generator-output/src/subdir3/build/README.txt
new file mode 100644
index 0000000000..90ef886193
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir3/build/README.txt
@@ -0,0 +1,4 @@
+A place-holder for this Xcode build output directory, so that the
+test script can verify that .xcodeproj files are not created in
+their normal location by making the src/ read-only, and then
+selectively making this build directory writable.
diff --git a/deps/gyp/test/generator-output/src/subdir3/inc3/include3.h b/deps/gyp/test/generator-output/src/subdir3/inc3/include3.h
new file mode 100644
index 0000000000..bf53bf1f00
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir3/inc3/include3.h
@@ -0,0 +1 @@
+#define INCLUDE3_STRING "inc3/include3.h"
diff --git a/deps/gyp/test/generator-output/src/subdir3/prog3.c b/deps/gyp/test/generator-output/src/subdir3/prog3.c
new file mode 100644
index 0000000000..c72233da19
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir3/prog3.c
@@ -0,0 +1,18 @@
+#include <stdio.h>
+
+#include "inc.h"
+#include "include1.h"
+#include "include2.h"
+#include "include3.h"
+#include "deeper.h"
+
+int main(void)
+{
+  printf("Hello from prog3.c\n");
+  printf("Hello from %s\n", INC_STRING);
+  printf("Hello from %s\n", INCLUDE1_STRING);
+  printf("Hello from %s\n", INCLUDE2_STRING);
+  printf("Hello from %s\n", INCLUDE3_STRING);
+  printf("Hello from %s\n", DEEPER_STRING);
+  return 0;
+}
diff --git a/deps/gyp/test/generator-output/src/subdir3/prog3.gyp b/deps/gyp/test/generator-output/src/subdir3/prog3.gyp
new file mode 100644
index 0000000000..46c5e000a2
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/subdir3/prog3.gyp
@@ -0,0 +1,25 @@
+# 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.
+
+{
+  'includes': [
+    '../symroot.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'prog3',
+      'type': 'executable',
+      'include_dirs': [
+        '..',
+        '../inc1',
+        '../subdir2/inc2',
+        'inc3',
+        '../subdir2/deeper',
+      ],
+      'sources': [
+        'prog3.c',
+      ],
+    },
+  ],
+}
diff --git a/deps/gyp/test/generator-output/src/symroot.gypi b/deps/gyp/test/generator-output/src/symroot.gypi
new file mode 100644
index 0000000000..519916427c
--- /dev/null
+++ b/deps/gyp/test/generator-output/src/symroot.gypi
@@ -0,0 +1,16 @@
+# 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.
+
+{
+  'variables': {
+    'set_symroot%': 0,
+  },
+  'conditions': [
+    ['set_symroot == 1', {
+      'xcode_settings': {
+        'SYMROOT': '<(DEPTH)/build',
+      },
+    }],
+  ],
+}