Generate platform files under platform subdir.

BUG=380054

Review URL: https://codereview.chromium.org/317813003

git-svn-id: svn://svn.chromium.org/blink/trunk@175589 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/core.gyp

@@ -36,6 +36,7 @@
     '../bindings/core/core.gypi',  # core can depend on bindings/core, but not on bindings
     'core.gypi',
     '../modules/modules_generated.gypi', # FIXME: Required by <(blink_modules_output_dir) below.
+    '../platform/platform_generated.gypi', # FIXME: Required by <(blink_platform_output_dir) below.
   ],
 
   'variables': {
@@ -43,13 +44,13 @@
 
     'webcore_include_dirs': [
       '..',  # WebKit/Source
-      # FIXME: Remove this after cleaning up platform dependecies on core and modules.
-      # Needed now for RuntimeEnabledFeatures.h, etc. http://crbug.com/380361
+      # Needed to include the generated binding headers.
       '<(SHARED_INTERMEDIATE_DIR)/blink',  # gen/blink
       # FIXME: Remove these once core scripts generate qualified
       # includes correctly: http://crbug.com/380054
       '<(blink_core_output_dir)',
       '<(blink_modules_output_dir)',
+      '<(blink_platform_output_dir)',
       '<(bindings_core_v8_output_dir)',
       '<(bindings_modules_v8_output_dir)',
     ],

third_party/WebKit/Source/core/core_generated.gypi

@@ -4,7 +4,6 @@
 
 {
   'variables': {
-    # FIXME: core_generated should output to here http://crbug.com/358074
     'blink_core_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/core',
   },
 }

third_party/WebKit/Source/modules/modules_generated.gypi

@@ -4,7 +4,6 @@
 
 {
   'variables': {
-    # FIXME: modules_generated should output to here http://crbug.com/358074
     'blink_modules_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/modules',
   },
 }

third_party/WebKit/Source/platform/blink_platform.gyp

@@ -57,6 +57,11 @@
       'BLINK_COMMON_IMPLEMENTATION=1',
       'INSIDE_BLINK',
     ],
+    'include_dirs': [
+      # FIXME: Remove these once scripts generate qualified
+      # includes correctly: http://crbug.com/380054
+      '<(blink_platform_output_dir)',
+    ],
     'sources': [
       'exported/WebCString.cpp',
       'exported/WebString.cpp',
@@ -212,7 +217,7 @@
     ],
     'include_dirs': [
       '<(angle_path)/include',
-      '<(SHARED_INTERMEDIATE_DIR)/blink',
+      '<(blink_platform_output_dir)',
     ],
     'xcode_settings': {
       # Some Mac-specific parts of WebKit won't compile without having this
@@ -225,10 +230,10 @@
       '<@(platform_heap_files)',
 
       # Additional .cpp files from platform_generated.gyp:make_platform_generated actions.
-      '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.h',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp',
+      '<(blink_platform_output_dir)/FontFamilyNames.cpp',
+      '<(blink_platform_output_dir)/RuntimeEnabledFeatures.cpp',
+      '<(blink_platform_output_dir)/RuntimeEnabledFeatures.h',
+      '<(blink_platform_output_dir)/ColorData.cpp',
     ],
     'sources/': [
       # Exclude all platform specific things, reinclude them below on a per-platform basis

third_party/WebKit/Source/platform/blink_platform.gypi

 {
+  'includes': [
+    'platform_generated.gypi',
+  ],
   'variables': {
     'platform_files': [
       'AsyncFileSystemCallbacks.h',

third_party/WebKit/Source/platform/blink_platform_tests.gyp

@@ -95,7 +95,7 @@
         'INSIDE_BLINK',
       ],
       'include_dirs': [
-        '<(SHARED_INTERMEDIATE_DIR)/blink',
+        '<(blink_platform_output_dir)',
       ],
       'sources': [
         '<@(platform_test_files)',

third_party/WebKit/Source/platform/platform_generated.gyp

@@ -32,6 +32,7 @@
   'includes': [
     '../build/features.gypi',
     '../build/scripts/scripts.gypi',
+    'platform_generated.gypi',
   ],
 
   'targets': [
@@ -47,15 +48,15 @@
             'fonts/FontFamilyNames.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.h',
+            '<(blink_platform_output_dir)/FontFamilyNames.cpp',
+            '<(blink_platform_output_dir)/FontFamilyNames.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_names.py',
             'fonts/FontFamilyNames.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_platform_output_dir)',
           ],
         },
         {
@@ -68,15 +69,15 @@
             '../build/scripts/templates/RuntimeEnabledFeatures.h.tmpl',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.h',
+            '<(blink_platform_output_dir)/RuntimeEnabledFeatures.cpp',
+            '<(blink_platform_output_dir)/RuntimeEnabledFeatures.h',
           ],
           'action': [
             'python',
             '../build/scripts/make_runtime_features.py',
             'RuntimeEnabledFeatures.in',
             '--output_dir',
-            '<(SHARED_INTERMEDIATE_DIR)/blink',
+            '<(blink_platform_output_dir)',
           ],
         },
         {
@@ -85,14 +86,14 @@
             'ColorData.gperf',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp',
+            '<(blink_platform_output_dir)/ColorData.cpp',
           ],
           'action': [
             '<(gperf_exe)',
             '--key-positions=*',
             '-D', '-s', '2',
             '<@(_inputs)',
-            '--output-file=<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp',
+            '--output-file=<(blink_platform_output_dir)/ColorData.cpp',
           ],
         },
       ]

third_party/WebKit/Source/platform/platform_generated.gypi

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform',
+  },
+}