Skip to content

GitLab

T
tangled
Commit 564210fc authored by dhollowa@chromium.org's avatar dhollowa@chromium.org
Browse files
Options

Revert 107967 - Introduces chromium_resources.gyp to factor out Chrome resource generation 

1. Factors out Chrome/Chromium resource generation into a separate
chrome_resources.gyp file.
2. Eliminates repetition between Mac and other platforms.
3. Breaks long "repack" actions out into separate files for greater readability.
4. Eliminates circular dependencies in the Aura shell, the Views components, and
the compositor when utilizing Chrome resources.

BUG=none
TEST=try bots run gyps and build correctly.

Review URL: http://codereview.chromium.org/8425002

TBR=dhollowa@chromium.org
Review URL: http://codereview.chromium.org/8430011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107984 0039d316-1c4b-4281-b951-d872f2087c98
parent ff411303
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 713 additions and 632 deletions
chrome/chrome.gyp
View file @ 564210fc
This diff is collapsed.
chrome/chrome_browser.gypi
View file @ 564210fc
......@@ -11,21 +11,21 @@
'app/policy/cloud_policy_codegen.gyp:policy',
'browser/sync/protocol/sync_proto.gyp:sync_proto',
'cert_logger_proto',
'chrome_resources.gyp:chrome_extra_resources',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources.gyp:platform_locale_settings',
'chrome_resources.gyp:theme_resources',
'chrome_extra_resources',
'chrome_resources',
'chrome_strings',
'common',
'common_net',
'debugger',
'in_memory_url_index_cache_proto',
'installer_util',
'platform_locale_settings',
'safe_browsing_proto',
'safe_browsing_report_proto',
# TODO(sync): Make browser not depend on syncapi_core directly.
'syncapi_core',
'syncapi_service',
'theme_resources',
'userfeedback_proto',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../content/content.gyp:content_browser',
......
chrome/chrome_common.gypi
View file @ 564210fc
......@@ -23,12 +23,12 @@
# shared with the 64-bit target, but it does not work due to a gyp
# issue.
'app/policy/cloud_policy_codegen.gyp:policy',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources.gyp:theme_resources',
'chrome_resources',
'chrome_strings',
'common_constants',
'common_net',
'default_plugin/default_plugin.gyp:default_plugin',
'theme_resources',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:base_static',
......@@ -262,7 +262,7 @@
'common/native_web_keyboard_event_views.cc',
'common/native_web_keyboard_event_views.h',
],
}],
}],
['use_aura==1', {
'dependencies!': [
'default_plugin/default_plugin.gyp:default_plugin',
......@@ -371,8 +371,8 @@
'common/net/x509_certificate_model.h',
],
'dependencies': [
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
'../base/base.gyp:base',
'../crypto/crypto.gyp:crypto',
'../gpu/gpu.gyp:gpu_ipc',
......
chrome/chrome_dll.gypi
View file @ 564210fc
......@@ -33,8 +33,8 @@
'dependencies': [
# On Windows, link the dependencies (libraries) that make
# up actual Chromium functionality into this .dll.
'chrome_resources.gyp:chrome_resources',
'chrome_version_resources',
'chrome_resources',
'installer_util_strings',
'../content/content.gyp:content_worker',
'../crypto/crypto.gyp:crypto',
......@@ -290,12 +290,6 @@
'app/theme/star.pdf',
'app/theme/star_lit.pdf',
'browser/mac/install.sh',
'<(INTERMEDIATE_DIR)/repack/chrome.pak',
'<(INTERMEDIATE_DIR)/repack/resources.pak',
'<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))',
# Note: pseudo_locales are generated via the packed_resources
# dependency but not copied to the final target. See
# common.gypi for more info.
],
'mac_bundle_resources!': [
'app/framework-Info.plist',
......@@ -308,8 +302,6 @@
# dependency here. flash_player.gyp will copy the Flash bundle
# into PRODUCT_DIR.
'../third_party/adobe/flash/flash_player.gyp:flash_player',
'chrome_resources.gyp:packed_extra_resources',
'chrome_resources.gyp:packed_resources',
],
'rules': [
{
......@@ -337,8 +329,150 @@
'repack_path': '../tools/grit/grit/format/repack.py',
},
'actions': [
# TODO(mark): These actions are duplicated for Linux and
# FreeBSD in the chrome target. Can they be unified?
{
'includes': ['chrome_repack_theme_resources_large.gypi']
'action_name': 'repack_chrome',
'variables': {
'pak_inputs': [
'<(grit_out_dir)/browser_resources.pak',
'<(grit_out_dir)/common_resources.pak',
'<(grit_out_dir)/default_plugin_resources/default_plugin_resources.pak',
'<(grit_out_dir)/renderer_resources.pak',
'<(grit_out_dir)/theme_resources.pak',
'<(grit_out_dir)/theme_resources_standard.pak',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
],
},
'inputs': [
'<(repack_path)',
'<@(pak_inputs)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/repack/chrome.pak',
],
'action': ['python', '<(repack_path)', '<@(_outputs)',
'<@(pak_inputs)'],
'process_outputs_as_mac_bundle_resources': 1,
},
{
'action_name': 'repack_theme_resources_large',
'variables': {
'pak_inputs': [
'<(grit_out_dir)/theme_resources_large.pak',
],
},
'inputs': [
'<(repack_path)',
'<@(pak_inputs)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/repack/theme_resources_large.pak',
],
'action': ['python', '<(repack_path)', '<@(_outputs)',
'<@(pak_inputs)'],
'process_outputs_as_mac_bundle_resources': 1,
},
{
'action_name': 'repack_locales',
'process_outputs_as_mac_bundle_resources': 1,
'variables': {
'conditions': [
['branding=="Chrome"', {
'branding_flag': ['-b', 'google_chrome',],
}, { # else: branding!="Chrome"
'branding_flag': ['-b', 'chromium',],
}],
],
},
'inputs': [
'tools/build/repack_locales.py',
# NOTE: Ideally the common command args would be shared
# amongst inputs/outputs/action, but the args include shell
# variables which need to be passed intact, and command
# expansion wants to expand the shell variables. Adding the
# explicit quoting here was the only way it seemed to work.
'>!@(<(repack_locales_cmd) -i <(branding_flag) -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
],
'outputs': [
'>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
],
'action': [
'<@(repack_locales_cmd)',
'<@(branding_flag)',
'-g', '<(grit_out_dir)',
'-s', '<(SHARED_INTERMEDIATE_DIR)',
'-x', '<(INTERMEDIATE_DIR)',
'<@(locales)',
],
},
{
# This is an exact copy of the above phase, except for two
# changes:
# 1. process_outputs_as_mac_bundle_resources is omitted.
# 2. We pass 'pseudo_locales' instead of 'locales' wherever
# 'locales' is used.
# The result is a build phase that builds all pseudo locales
# but doesn't copy them to the final dll/framework.
'action_name': 'repack_pseudo_locales',
'variables': {
'conditions': [
['branding=="Chrome"', {
'branding_flag': ['-b', 'google_chrome',],
}, { # else: branding!="Chrome"
'branding_flag': ['-b', 'chromium',],
}],
],
},
'inputs': [
'tools/build/repack_locales.py',
# NOTE: Ideally the common command args would be shared
# amongst inputs/outputs/action, but the args include shell
# variables which need to be passed intact, and command
# expansion wants to expand the shell variables. Adding the
# explicit quoting here was the only way it seemed to work.
'>!@(<(repack_locales_cmd) -i <(branding_flag) -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(pseudo_locales))',
],
'outputs': [
'<(INTERMEDIATE_DIR)/<(pseudo_locales).pak'
],
'action': [
'<@(repack_locales_cmd)',
'<@(branding_flag)',
'-g', '<(grit_out_dir)',
'-s', '<(SHARED_INTERMEDIATE_DIR)',
'-x', '<(INTERMEDIATE_DIR)',
'<@(pseudo_locales)',
],
},
{
'action_name': 'repack_resources',
'variables': {
'pak_inputs': [
'<(grit_out_dir)/component_extension_resources.pak',
'<(grit_out_dir)/devtools_frontend_resources.pak',
'<(grit_out_dir)/devtools_resources.pak',
'<(grit_out_dir)/net_internals_resources.pak',
'<(grit_out_dir)/options_resources.pak',
'<(grit_out_dir)/shared_resources.pak',
'<(grit_out_dir)/sync_internals_resources.pak',
'<(grit_out_dir)/workers_resources.pak',
],
},
'inputs': [
'<(repack_path)',
'<@(pak_inputs)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/repack/resources.pak',
],
'action': ['python', '<(repack_path)', '<@(_outputs)',
'<@(pak_inputs)'],
'process_outputs_as_mac_bundle_resources': 1,
},
],
'postbuilds': [
......@@ -417,6 +551,18 @@
}],
],
},
{
'destination': '<(PRODUCT_DIR)',
'files': [
'<(INTERMEDIATE_DIR)/repack/resources.pak'
],
},
{
'destination': '<(PRODUCT_DIR)/pseudo_locales',
'files': [
'<(INTERMEDIATE_DIR)/<(pseudo_locales).pak'
],
},
{
'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/resources',
'files': [],
......
chrome/chrome_exe.gypi
View file @ 564210fc
......@@ -400,8 +400,8 @@
}],
],
'dependencies': [
'chrome_resources.gyp:packed_extra_resources',
'chrome_resources.gyp:packed_resources',
'packed_extra_resources',
'packed_resources',
# Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
# file decide what to do on a per-OS basis; on Mac, internal plugins
# go inside the framework, so this dependency is in chrome_dll.gypi.
......
chrome/chrome_installer_util.gypi
View file @ 564210fc
......@@ -99,8 +99,8 @@
'installer_util_strings',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'common_constants',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
'../content/content.gyp:content_common',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
......@@ -174,8 +174,8 @@
'type': 'static_library',
'dependencies': [
'common_constants',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
],
'sources': [
'installer/util/master_preferences.cc',
......
chrome/chrome_renderer.gypi
View file @ 564210fc
......@@ -10,8 +10,8 @@
'dependencies': [
'common',
'common_net',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
'safe_browsing_proto',
'../content/content.gyp:content_renderer',
'../net/net.gyp:net',
......
chrome/chrome_repack_chrome.gypi deleted 100644 → 0
View file @ ff411303
# Copyright (c) 2011 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.
{
'action_name': 'repack_chrome',
'variables': {
'pak_inputs': [
'<(grit_out_dir)/browser_resources.pak',
'<(grit_out_dir)/common_resources.pak',
'<(grit_out_dir)/default_plugin_resources/default_plugin_resources.pak',
'<(grit_out_dir)/renderer_resources.pak',
'<(grit_out_dir)/theme_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
],
'conditions': [
['OS != "mac"', {
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
]
}],
['touchui==0 or OS == "mac"', {
'pak_inputs': [
'<(grit_out_dir)/theme_resources_standard.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
],
}, { # else: touchui!=0
'pak_inputs': [
'<(grit_out_dir)/theme_resources_large.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large/ui_resources_large.pak',
],
}],
],
},
'inputs': [
'<(repack_path)',
'<@(pak_inputs)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/repack/chrome.pak',
],
'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
}
chrome/chrome_repack_locales.gypi deleted 100644 → 0
View file @ ff411303
# Copyright (c) 2011 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.
{
'action_name': 'repack_locales',
'variables': {
'conditions': [
['branding=="Chrome"', {
'branding_flag': ['-b', 'google_chrome',],
}, { # else: branding!="Chrome"
'branding_flag': ['-b', 'chromium',],
}],
],
},
'inputs': [
'tools/build/repack_locales.py',
'<!@pymod_do_main(repack_locales -i <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
],
'outputs': [
'<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
],
'action': [
'<@(repack_locales_cmd)',
'<@(branding_flag)',
'-g', '<(grit_out_dir)',
'-s', '<(SHARED_INTERMEDIATE_DIR)',
'-x', '<(INTERMEDIATE_DIR)',
'<@(locales)',
],
}
chrome/chrome_repack_pseudo_locales.gypi deleted 100644 → 0
View file @ ff411303
# Copyright (c) 2011 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.
{
'action_name': 'repack_pseudo_locales',
'variables': {
'conditions': [
['branding=="Chrome"', {
'branding_flag': ['-b', 'google_chrome',],
}, { # else: branding!="Chrome"
'branding_flag': ['-b', 'chromium',],
}],
]
},
'inputs': [
'tools/build/repack_locales.py',
'<!@pymod_do_main(repack_locales -i <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(pseudo_locales))'
],
'conditions': [
['OS == "mac"', {
'outputs': [
'<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(pseudo_locales))'
],
}, { # else 'OS != "mac"'
'outputs': [
'<(INTERMEDIATE_DIR)/<(pseudo_locales).pak'
],
}],
],
'action': [
'<@(repack_locales_cmd)',
'<@(branding_flag)',
'-g', '<(grit_out_dir)',
'-s', '<(SHARED_INTERMEDIATE_DIR)',
'-x', '<(INTERMEDIATE_DIR)',
'<@(pseudo_locales)',
],
}
chrome/chrome_repack_resources.gypi deleted 100644 → 0
View file @ ff411303
# Copyright (c) 2011 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.
{
'action_name': 'repack_resources',
'variables': {
'pak_inputs': [
'<(grit_out_dir)/component_extension_resources.pak',
'<(grit_out_dir)/devtools_frontend_resources.pak',
'<(grit_out_dir)/devtools_resources.pak',
'<(grit_out_dir)/net_internals_resources.pak',
'<(grit_out_dir)/options_resources.pak',
'<(grit_out_dir)/shared_resources.pak',
'<(grit_out_dir)/sync_internals_resources.pak',
'<(grit_out_dir)/workers_resources.pak',
],
'conditions': [
['OS != "mac"', {
'pak_inputs': [
'<(grit_out_dir)/quota_internals_resources.pak',
],
}],
],
},
'inputs': [
'<(repack_path)',
'<@(pak_inputs)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/repack/resources.pak',
],
'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
}
chrome/chrome_repack_theme_resources_large.gypi deleted 100644 → 0
View file @ ff411303
# Copyright (c) 2011 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.
{
'action_name': 'repack_theme_resources_large',
'variables': {
'pak_inputs': [
'<(grit_out_dir)/theme_resources_large.pak',
],
},
'inputs': [
'<(repack_path)',
'<@(pak_inputs)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/repack/theme_resources_large.pak',
],
'action': ['python', '<(repack_path)', '<@(_outputs)',
'<@(pak_inputs)'],
'process_outputs_as_mac_bundle_resources': 1,
}
chrome/chrome_resources.gyp deleted 100644 → 0
View file @ ff411303
This diff is collapsed.
chrome/chrome_tests.gypi
View file @ 564210fc
# Copyright (c) 2011 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' : {
'pyautolib_sources': [
......@@ -33,17 +34,17 @@
'target_name': 'test_support_common',
'type': 'static_library',
'dependencies': [
'app/policy/cloud_policy_codegen.gyp:policy',
'browser',
'browser/sync/protocol/sync_proto.gyp:sync_proto',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources.gyp:theme_resources',
'common',
'plugin',
'renderer',
'plugin',
'service',
'utility',
'chrome_resources',
'chrome_strings',
'app/policy/cloud_policy_codegen.gyp:policy',
'browser/sync/protocol/sync_proto.gyp:sync_proto',
'theme_resources',
'../base/base.gyp:test_support_base',
'../content/content.gyp:content_app',
'../content/content.gyp:content_gpu',
......@@ -265,10 +266,10 @@
'target_name': 'test_support_ui',
'type': 'static_library',
'dependencies': [
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources.gyp:theme_resources',
'test_support_common',
'chrome_resources',
'chrome_strings',
'theme_resources',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
......@@ -398,9 +399,9 @@
'target_name': 'test_support_unit',
'type': 'static_library',
'dependencies': [
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'test_support_common',
'chrome_resources',
'chrome_strings',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
......@@ -427,10 +428,10 @@
'type': 'executable',
'dependencies': [
'browser',
'chrome_resources.gyp:theme_resources',
'renderer',
'test_support_common',
'test_support_ui',
'theme_resources',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../third_party/libxml/libxml.gyp:libxml',
......@@ -481,8 +482,8 @@
'dependencies': [
'browser/sync/protocol/sync_proto.gyp:sync_proto',
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
'debugger',
'syncapi_core',
'test_support_common',
......@@ -682,11 +683,11 @@
'target_name': 'ui_tests',
'type': 'executable',
'dependencies': [
'browser',
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'browser',
'common',
'chrome_resources',
'chrome_strings',
'test_support_ui',
'../base/base.gyp:base',
'../net/net.gyp:net',
......@@ -877,8 +878,8 @@
'dependencies': [
'browser',
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
'chromedriver_support',
'common',
'syncapi_core',
......@@ -1121,8 +1122,8 @@
'../ui/ui.gyp:ui_resources_standard',
'../ui/ui.gyp:ui_test_support',
'../v8/tools/gyp/v8.gyp:v8',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
],
'include_dirs': [
'..',
......@@ -2156,9 +2157,9 @@
],
}, { # OS != "mac"
'dependencies': [
'chrome_resources.gyp:packed_extra_resources',
'chrome_resources.gyp:packed_resources',
'convert_dict_lib',
'packed_extra_resources',
'packed_resources',
'../third_party/hunspell/hunspell.gyp:hunspell',
],
'sources!': [
......@@ -2281,8 +2282,8 @@
'browser',
'browser/sync/protocol/sync_proto.gyp:sync_proto',
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
'renderer',
'test_support_common',
'../base/base.gyp:base',
......@@ -2951,9 +2952,9 @@
'dependencies': [
'browser',
'chrome',
'chrome_resources.gyp:theme_resources',
'test_support_common',
'test_support_ui',
'theme_resources',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
......@@ -3002,8 +3003,8 @@
'type': 'executable',
'dependencies': [
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
'debugger',
'test_support_common',
'test_support_ui',
......@@ -3236,8 +3237,8 @@
],
},{ # OS!="mac"
'dependencies': [
'chrome_resources.gyp:packed_extra_resources',
'chrome_resources.gyp:packed_resources'
'packed_extra_resources',
'packed_resources'
],
}],
['OS=="linux" and chromeos==1', {
......@@ -3254,10 +3255,10 @@
'browser',
'browser/sync/protocol/sync_proto.gyp:sync_proto',
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'common',
'renderer',
'chrome_strings',
'test_support_common',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
......@@ -3550,8 +3551,8 @@
'dependencies': [
'browser',
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
'renderer',
'test_support_common',
'test_support_ui',
......@@ -3658,8 +3659,8 @@
'type': 'executable',
'dependencies': [
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
'test_support_common',
'test_support_ui',
'../skia/skia.gyp:skia',
......@@ -3730,10 +3731,10 @@
'type': 'executable',
'dependencies': [
'browser',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'common',
'renderer',
'chrome_resources',
'chrome_strings',
'../content/content.gyp:content_gpu',
'../content/content.gyp:test_support_content',
'../base/base.gyp:base',
......@@ -3859,12 +3860,12 @@
'product_prefix': '_',
'dependencies': [
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources.gyp:theme_resources',
'debugger',
'syncapi_core',
'test_support_common',
'chrome_resources',
'chrome_strings',
'theme_resources',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
......
chrome/nacl.gypi
View file @ 564210fc
......@@ -69,8 +69,8 @@
'python build_nacl_irt.py --inputs',
},
'dependencies': [
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources',
'chrome_strings',
'common',
'../webkit/support/webkit_support.gyp:glue',
'../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome',
......
chrome_frame/chrome_frame.gyp
View file @ 564210fc
......@@ -34,10 +34,10 @@
],
'target_defaults': {
'dependencies': [
'../chrome/chrome_resources.gyp:chrome_resources',
'../chrome/chrome_resources.gyp:chrome_strings',
'../chrome/chrome_resources.gyp:packed_resources',
'../chrome/chrome_resources.gyp:theme_resources',
'../chrome/chrome.gyp:chrome_resources',
'../chrome/chrome.gyp:chrome_strings',
'../chrome/chrome.gyp:packed_resources',
'../chrome/chrome.gyp:theme_resources',
'../skia/skia.gyp:skia',
],
'defines': [ 'ISOLATION_AWARE_ENABLED=1' ],
......@@ -376,10 +376,10 @@
'dependencies': [
'../base/base.gyp:test_support_base',
'../chrome/chrome.gyp:browser',
'../chrome/chrome.gyp:chrome_resources',
'../chrome/chrome.gyp:debugger',
'../chrome/chrome.gyp:renderer',
'../chrome/chrome.gyp:syncapi_core',
'../chrome/chrome_resources.gyp:chrome_resources',
'../content/content.gyp:content_gpu',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
......
ui/aura/aura.gyp
View file @ 564210fc
......@@ -110,7 +110,6 @@
'type': 'executable',
'dependencies': [
'../../base/base.gyp:test_support_base',
'../../chrome/chrome_resources.gyp:packed_resources',
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
'../gfx/compositor/compositor.gyp:compositor_test_support',
......@@ -144,6 +143,11 @@
'<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
],
}],
['OS!="mac"', {
'dependencies': [
'../../chrome/chrome.gyp:packed_resources',
],
}],
],
},
],
......
ui/aura_shell/aura_shell.gyp
View file @ 564210fc
......@@ -80,7 +80,6 @@
'dependencies': [
'../../base/base.gyp:base',
'../../base/base.gyp:test_support_base',
'../../chrome/chrome_resources.gyp:packed_resources',
'../../build/temp_gyp/googleurl.gyp:googleurl',
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
......@@ -111,6 +110,13 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
],
'conditions': [
['OS!="mac"', {
'dependencies': [
'../../chrome/chrome.gyp:packed_resources',
],
}],
],
},
{
'target_name': 'aura_shell_exe',
......@@ -118,7 +124,6 @@
'dependencies': [
'../../base/base.gyp:base',
'../../base/base.gyp:base_i18n',
'../../chrome/chrome_resources.gyp:packed_resources',
'../../skia/skia.gyp:skia',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
......@@ -146,6 +151,13 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
],
'conditions': [
['OS!="mac"', {
'dependencies': [
'../../chrome/chrome.gyp:packed_resources',
],
}],
],
},
# It's convenient for aura_shell developers to be able to build all
# compositor and aura targets from within this solution.
......
ui/gfx/compositor/compositor.gyp
View file @ 564210fc
......@@ -130,7 +130,6 @@
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
......@@ -164,6 +163,11 @@
'<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
],
}],
['OS!="mac"', {
'dependencies': [
'<(DEPTH)/chrome/chrome.gyp:packed_resources',
],
}],
],
},
{
......
views/views.gyp
View file @ 564210fc
# Copyright (c) 2011 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': {
'chromium_code': 1,
......@@ -549,10 +550,6 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
# TODO(jcivelli): ideally the resource needed by views would be
# factored out. (for some reason it pulls in a bunch
# unrelated things like v8, sqlite nss...).
'../chrome/chrome_resources.gyp:packed_resources',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
......@@ -668,6 +665,14 @@
['exclude', '../ui/aura/test/test_desktop_delegate.h'],
],
}],
['OS!="mac"', {
'dependencies': [
# TODO(jcivelli): ideally the resource needed by views would be
# factored out. (for some reason it pulls in a bunch
# unrelated things like v8, sqlite nss...).
'../chrome/chrome.gyp:packed_resources',
],
}],
],
},
{
......@@ -676,7 +681,6 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../chrome/chrome_resources.gyp:packed_resources',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
......@@ -776,6 +780,11 @@
'examples/table_example.h',
],
}],
['OS!="mac"', {
'dependencies': [
'../chrome/chrome.gyp:packed_resources',
],
}],
],
},
{
......@@ -783,7 +792,6 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../chrome/chrome_resources.gyp:packed_resources',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
......@@ -829,6 +837,11 @@
'../third_party/wtl/include',
],
}],
['OS!="mac"', {
'dependencies': [
'../chrome/chrome.gyp:packed_resources',
],
}],
],
},
{
......@@ -837,7 +850,6 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../chrome/chrome_resources.gyp:packed_resources',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
......@@ -890,6 +902,11 @@
'../third_party/wtl/include',
],
}],
['OS!="mac"', {
'dependencies': [
'../chrome/chrome.gyp:packed_resources',
],
}],
],
},
],
......@@ -902,7 +919,6 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../chrome/chrome_resources.gyp:packed_resources',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
......@@ -934,6 +950,11 @@
'../third_party/wtl/include',
],
}],
['OS!="mac"', {
'dependencies': [
'../chrome/chrome.gyp:packed_resources',
],
}],
],
},
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment