summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-12 04:58:08 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-12 04:58:08 +0000
commit8365eef5ddc3c90aa10f3ed08c83f290a277096f (patch)
tree1774e9106e8126b5d36a57665e5ce76138e010f4 /views
parent1ce4d64fbdf3bcc6bb8124eae5d98d7d978abf03 (diff)
downloadchromium_src-8365eef5ddc3c90aa10f3ed08c83f290a277096f.zip
chromium_src-8365eef5ddc3c90aa10f3ed08c83f290a277096f.tar.gz
chromium_src-8365eef5ddc3c90aa10f3ed08c83f290a277096f.tar.bz2
Fix a hidden dependency from view_examples to chrome on Linux.
We no longer need to build chrome first just for the resource files. Adding a dependency to "packed_resources" is sufficient. TEST=try; locally clean built view_examples on linux BUG=29969 Review URL: http://codereview.chromium.org/487020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/examples/examples_main.cc2
-rw-r--r--views/views.gyp1
2 files changed, 1 insertions, 2 deletions
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index 0b8b7b1..81137c59 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -56,8 +56,6 @@ void ExamplesMain::Run() {
icu_util::Initialize();
- // This requires chrome to be built first right now.
- // TODO(oshima): fix build to include resource file.
ResourceBundle::InitSharedInstance(L"en-US");
MessageLoop main_message_loop(MessageLoop::TYPE_UI);
diff --git a/views/views.gyp b/views/views.gyp
index ec2b7c80..11058f1 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -374,6 +374,7 @@
['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
+ '../chrome/chrome.gyp:packed_resources',
],
},
],