| Index: content/content_shell.gypi
|
| diff --git a/content/content_shell.gypi b/content/content_shell.gypi
|
| index b7f25a79eb13ddb7cafb5a4a532c1443a9efbe10..be5dcd8a266aec788b0740ba9b0d19a01abbb827 100644
|
| --- a/content/content_shell.gypi
|
| +++ b/content/content_shell.gypi
|
| @@ -27,6 +27,7 @@
|
| 'chromium_code': 1,
|
| },
|
| 'dependencies': [
|
| + 'app/strings/content_strings.gyp:content_strings',
|
| 'content.gyp:content_app_both',
|
| 'content.gyp:content_browser',
|
| 'content.gyp:content_common',
|
| @@ -256,10 +257,10 @@
|
| }],
|
| ['OS=="win"', {
|
| 'resource_include_dirs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/webkit',
|
| + '<(SHARED_INTERMEDIATE_DIR)/content/app/strings',
|
| ],
|
| 'dependencies': [
|
| - '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
|
| + '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
|
| ],
|
| 'configurations': {
|
| 'Debug_Base': {
|
| @@ -430,6 +431,7 @@
|
| 'target_name': 'content_shell_pak',
|
| 'type': 'none',
|
| 'dependencies': [
|
| + 'app/strings/content_strings.gyp:content_strings',
|
| 'browser/tracing/tracing_resources.gyp:tracing_resources',
|
| 'content_resources.gyp:content_resources',
|
| 'content_shell_resources',
|
| @@ -438,7 +440,6 @@
|
| '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
|
| '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
|
| '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
|
| - '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
|
| ],
|
| 'conditions': [
|
| ['OS!="android"', {
|
| @@ -453,6 +454,7 @@
|
| 'variables': {
|
| 'pak_inputs': [
|
| '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
|
| '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
|
| '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
|
| '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
|
| @@ -462,7 +464,6 @@
|
| '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
|
| '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
|
| '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
|
| - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
|
| ],
|
| 'conditions': [
|
| ['OS!="android"', {
|
|
|