Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(604)

Unified Diff: views/views.gyp

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed some chrome changes Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index d86723599f011fa170a430e8bbe43fa3cb9e0938..951577b4f7c9176a5d384491831b925970a21cf5 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -13,11 +13,11 @@
['include', '_(win)\\.cc$'],
['include', '/win/'],
['include', '/win_[^/]*\\.cc$'],
- ['exclude', 'touchui/touch_factory.cc'],
]}],
['touchui==0', {
'sources/': [
['exclude', '_(touch)\\.cc$'],
+ ['exclude', 'touchui/touch_factory.cc'],
sadrul 2011/09/22 17:44:31 This should not be the case: the touch_factory sho
DaveMoore 2011/09/22 18:03:07 Done.
],
}],
['use_aura==1', {
@@ -550,12 +550,14 @@
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
'../build/temp_gyp/googleurl.gyp:googleurl',
+ '../chrome/chrome.gyp:packed_resources',
sadrul 2011/09/22 17:44:31 Having to do this is unfortunate. It'd be wonderfu
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../ui/base/strings/ui_strings.gyp:ui_strings',
+ '../ui/gfx/compositor/compositor.gyp:compositor',
'../ui/ui.gyp:gfx_resources',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',

Powered by Google App Engine
This is Rietveld 408576698