Declare dependency on blink_headers in targets that use blink headers

This updates targets that use blink public API headers to depend on the
blink_headers target, which sets up include paths so the headers can function
without needing relative path hacks. Targets that expose #includes of public
blink headers export the dependent settings from blink_headers to their
dependents.

BUG=350097

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257357 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 41 insertions, 4 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index a0a438c..602e752 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -247,6 +247,7 @@
             'common/extensions/api/api.gyp:chrome_api',
             '../base/base.gyp:base',
             '../components/components.gyp:wifi_component',
+            '../content/content.gyp:content_common',
             '../content/content.gyp:content_utility',
             '../media/media.gyp:media',
             '../skia/skia.gyp:skia',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c00bdda..8248da4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -94,6 +94,7 @@
       ],
       'export_dependent_settings': [
         '../components/components.gyp:autofill_core_browser',
+        '../content/content.gyp:content_browser',
         '../sql/sql.gyp:sql',
         '../sync/sync.gyp:sync',
       ],
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index b619605..8fcb586 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -64,6 +64,9 @@
         '..',
         '<(INTERMEDIATE_DIR)',
       ],
+      'export_dependent_settings': [
+        '../content/content.gyp:content_browser',
+      ],
       'sources': [
         # All .cc, .h, .m, and .mm files under browser/extensions except for
         # tests and mocks.
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e4ae7d2..dca8616 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2351,6 +2351,9 @@
           '<(protoc_out_dir)',
         ],
       },
+      'export_dependent_settings': [
+        'browser',
+      ],
       'sources': [
         'browser/sync/test/integration/apps_helper.cc',
         'browser/sync/test/integration/apps_helper.h',
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index 03e276d..3e1233f 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -178,6 +178,7 @@
         'root_namespace': 'extensions::api',
       },
       'dependencies': [
+        '<(DEPTH)/content/content.gyp:content_browser',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/sync/sync.gyp:sync',
       ],
diff --git a/components/dom_distiller.gypi b/components/dom_distiller.gypi
index ba50bb7..5ac311e 100644
--- a/components/dom_distiller.gypi
+++ b/components/dom_distiller.gypi
@@ -134,6 +134,7 @@
                 'component_resources.gyp:component_resources',
                 'component_strings.gyp:component_strings',
                 'dom_distiller_core',
+                '../content/content.gyp:content_browser',
                 '../net/net.gyp:net',
                 '../skia/skia.gyp:skia',
                 '../sync/sync.gyp:sync',
diff --git a/components/nacl.gyp b/components/nacl.gyp
index 2bff584..b979f00 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -401,6 +401,9 @@
       'include_dirs': [
         '..',
       ],
+      'dependencies': [
+        '../content/content.gyp:content_common',
+      ],
     },
   ]
 }
diff --git a/content/content.gyp b/content/content.gyp
index 6098fe1..8aa3bfb 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -143,6 +143,9 @@
           'dependencies': [
             'content_common',
           ],
+          'export_dependent_settings': [
+            'content_common',
+          ],
         },
         {
           'target_name': 'content_browser',
@@ -337,11 +340,13 @@
           'target_name': 'content_app_both',
           'type': 'none',
           'dependencies': ['content'],
+          'export_dependent_settings': ['content'],
         },
         {
           'target_name': 'content_browser',
           'type': 'none',
           'dependencies': ['content'],
+          'export_dependent_settings': ['content'],
         },
         {
           'target_name': 'content_common',
@@ -349,6 +354,7 @@
           'dependencies': ['content', 'content_resources.gyp:content_resources'],
           # Disable c4267 warnings until we fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
+          'export_dependent_settings': ['content'],
         },
         {
           'target_name': 'content_child',
@@ -381,6 +387,7 @@
           'target_name': 'content_utility',
           'type': 'none',
           'dependencies': ['content'],
+          'export_dependent_settings': ['content'],
         },
         {
           'target_name': 'content_worker',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 4e943fc..74f931b 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -13,6 +13,7 @@
     '../third_party/re2/re2.gyp:re2',
     '../third_party/zlib/google/zip.gyp:zip',
     '../third_party/zlib/zlib.gyp:zlib',
+    '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
     '../ui/accessibility/accessibility.gyp:accessibility',
     '../ui/accessibility/accessibility.gyp:ax_gen',
     '../ui/base/ui_base.gyp:ui_base',
@@ -26,6 +27,10 @@
   ],
   'export_dependent_settings': [
     '../ui/accessibility/accessibility.gyp:ax_gen',
+    # The public content API headers directly include Blink API headers, so we
+    # have to export the blink header settings so that relative paths in these
+    # headers resolve correctly.
+    '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
   ],
   'include_dirs': [
     '..',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 8e46bb5..9e0a8d6 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -8,6 +8,7 @@
     '../components/tracing.gyp:tracing',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
+    '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
     '../third_party/icu/icu.gyp:icuuc',
     '../third_party/libjingle/libjingle.gyp:libjingle',
     '../ui/accessibility/accessibility.gyp:accessibility',
@@ -22,6 +23,10 @@
   ],
   'export_dependent_settings': [
     '../base/base.gyp:base',
+    # The public content API headers directly include Blink API headers, so we
+    # have to export the blink header settings so that relative paths in these
+    # headers resolve correctly.
+    '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
   ],
   'sources': [
     'public/common/assert_matching_enums.cc',
diff --git a/content/content_ppapi_plugin.gypi b/content/content_ppapi_plugin.gypi
index 55a77f3..578ffd0 100644
--- a/content/content_ppapi_plugin.gypi
+++ b/content/content_ppapi_plugin.gypi
@@ -11,6 +11,7 @@
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        '../third_party/WebKit/public/blink.gyp:blink',
       ],
       'sources': [
         'ppapi_plugin/broker_process_dispatcher.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index d1154bf..2a61607 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -901,6 +901,7 @@
           'type': 'static_library',
           'dependencies': [
             'content_shell_lib',
+            'content.gyp:content_browser',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../ui/accessibility/accessibility.gyp:ax_gen',
diff --git a/ppapi/ppapi_proxy_nacl.gyp b/ppapi/ppapi_proxy_nacl.gyp
index bbbab09..14deb4c 100644
--- a/ppapi/ppapi_proxy_nacl.gyp
+++ b/ppapi/ppapi_proxy_nacl.gyp
@@ -28,19 +28,20 @@
             '..',
           ],
           'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
             '../base/base_nacl.gyp:base_nacl',
+            '../components/tracing_nacl.gyp:tracing_nacl',
             '../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
             '../gpu/gpu_nacl.gyp:command_buffer_client_nacl',
             '../gpu/gpu_nacl.gyp:command_buffer_common_nacl',
-            '../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
             '../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
+            '../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
             '../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
             '../ipc/ipc_nacl.gyp:ipc_nacl',
-            '../ppapi/ppapi_shared_nacl.gyp:ppapi_shared_nacl',
+            '../native_client/tools.gyp:prep_toolchain',
             '../ppapi/ppapi_ipc_nacl.gyp:ppapi_ipc_nacl',
+            '../ppapi/ppapi_shared_nacl.gyp:ppapi_shared_nacl',
+            '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
             '../third_party/khronos/khronos.gyp:khronos_headers',
-            '../components/tracing_nacl.gyp:tracing_nacl',
           ],
         },
       ],
diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp
index 13f5af6..74c78db 100644
--- a/webkit/common/webkit_common.gyp
+++ b/webkit/common/webkit_common.gyp
@@ -26,6 +26,10 @@
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
+        '<(DEPTH)/third_party/WebKit/public/blink_headers.gyp:blink_headers',
+      ],
+      'export_dependent_settings': [
+        '<(DEPTH)/third_party/WebKit/public/blink_headers.gyp:blink_headers',
       ],
 
       'include_dirs': [