Fix chrome_api and extensions_api gyp dependencies.

Declare a direct dependency on each generated headers target when it's used in source files directly. Add each to export_dependent_settings when it's used in public headers, and ensure that the targets containing files that include those headers have direct dependencies on the target containing those headers. BUG=355443 R=rsleevi@chromium.org, thakis@chromium.org Review URL: https://codereview.chromium.org/215633004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260149 0039d316-1c4b-4281-b951-d872f2087c98
excellent-media · Mar 28, 2014 · 5eda6dc · 5eda6dc
1 parent 79af434
commit 5eda6dc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
@@ -313,6 +313,9 @@
             '..',
             '<(grit_out_dir)',
           ],
+          'export_dependent_settings': [
+            'common/extensions/api/api.gyp:chrome_api',
+          ],
           'conditions': [
             ['toolkit_uses_gtk == 1', {
               'dependencies': [

diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
@@ -41,7 +41,6 @@
         'installer_util',
         'safe_browsing_proto',
         'safe_browsing_report_proto',
-        '../third_party/re2/re2.gyp:re2',
         '../breakpad/breakpad.gyp:breakpad_client',
         '../build/linux/system.gyp:dbus',
         '../chromeos/chromeos.gyp:chromeos',
@@ -84,6 +83,7 @@
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../third_party/protobuf/protobuf.gyp:protoc#host',
+        '../third_party/re2/re2.gyp:re2',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/base/ui_base.gyp:ui_base',
@@ -110,6 +110,7 @@
         ],
       },
       'export_dependent_settings': [
+        'common/extensions/api/api.gyp:chrome_api',
         '../sync/sync.gyp:sync',
       ],
       'include_dirs': [

diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
@@ -39,6 +39,7 @@
         '../device/bluetooth/bluetooth.gyp:device_bluetooth',
         '../device/hid/hid.gyp:device_hid',
         '../device/serial/serial.gyp:device_serial',
+        '../extensions/common/api/api.gyp:extensions_api',
         '../extensions/extensions.gyp:extensions_browser',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
@@ -65,6 +66,7 @@
         '<(INTERMEDIATE_DIR)',
       ],
       'export_dependent_settings': [
+        'common/extensions/api/api.gyp:chrome_api',
         '../content/content.gyp:content_browser',
       ],
       'sources': [

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
@@ -406,11 +406,15 @@
             '<(DEPTH)/components/components.gyp:signin_core_common',
             '<(DEPTH)/components/nacl.gyp:nacl_common',
             '<(DEPTH)/components/components.gyp:visitedlink_common',
+            '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
             '<(DEPTH)/extensions/extensions.gyp:extensions_common',
             '<(DEPTH)/ipc/ipc.gyp:ipc',
             '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
             '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
           ],
+          'export_dependent_settings': [
+            '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
+          ],
         }, {  # OS == ios
           'sources/': [
             ['exclude', '^common/child_process_'],

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
@@ -88,7 +88,6 @@
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:packed_extra_resources',
         'chrome_resources.gyp:packed_resources',
-        'common/extensions/api/api.gyp:chrome_api',
         'debugger',
         'renderer',
         'test_support_common',
@@ -1717,6 +1716,7 @@
                     '../third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc',
                   ],
                   'dependencies': [
+                    'browser_chromeos',
                     '../third_party/liblouis/liblouis_nacl.gyp:liblouis_test_data',
                   ],
                 }],
@@ -2442,7 +2442,6 @@
         'chrome_resources.gyp:packed_extra_resources',
         'chrome_resources.gyp:packed_resources',
         'common',
-        'common/extensions/api/api.gyp:chrome_api',
         'renderer',
         'test_support_sync_integration',
         '../sync/sync.gyp:sync',
@@ -2595,7 +2594,6 @@
       'target_name': 'sync_performance_tests',
       'type': 'executable',
       'dependencies': [
-        'common/extensions/api/api.gyp:chrome_api',
         'test/perf/perf_test.gyp:*',
         'test_support_sync_integration',
         '../sync/sync.gyp:sync',

diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
@@ -11,7 +11,6 @@
       'target_name': 'extensions_common',
       'type': 'static_library',
       'dependencies': [
-        'common/api/api.gyp:extensions_api',
         '../third_party/re2/re2.gyp:re2',
         # TODO(benwells): figure out what to do with the api target and
         # api resources compiled into the chrome resource bundle.
@@ -175,6 +174,7 @@
       'type': 'static_library',
       'dependencies': [
         'extensions_common',
+        'common/api/api.gyp:extensions_api',
         # TODO(jamescook|derat): Pull strings into extensions module.
         '../chrome/chrome_resources.gyp:chrome_strings',
         '../chrome/common/extensions/api/api.gyp:chrome_api',