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

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

Issue 11103031: webkit: Merge blob and fileapi into one build target 'storage' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Leave *.gypi files in blob and fileapi Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser_chromeos', 9 'target_name': 'browser_chromeos',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 '../third_party/re2/re2.gyp:re2', 84 '../third_party/re2/re2.gyp:re2',
85 '../third_party/zlib/zlib.gyp:zlib', 85 '../third_party/zlib/zlib.gyp:zlib',
86 '../ui/base/strings/ui_strings.gyp:ui_strings', 86 '../ui/base/strings/ui_strings.gyp:ui_strings',
87 '../ui/surface/surface.gyp:surface', 87 '../ui/surface/surface.gyp:surface',
88 '../ui/ui.gyp:ui', 88 '../ui/ui.gyp:ui',
89 '../ui/ui.gyp:ui_resources', 89 '../ui/ui.gyp:ui_resources',
90 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 90 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
91 '../v8/tools/gyp/v8.gyp:v8', 91 '../v8/tools/gyp/v8.gyp:v8',
92 '../ui/views/controls/webview/webview.gyp:webview', 92 '../ui/views/controls/webview/webview.gyp:webview',
93 '../webkit/support/webkit_support.gyp:appcache', 93 '../webkit/support/webkit_support.gyp:appcache',
94 '../webkit/support/webkit_support.gyp:blob',
95 '../webkit/support/webkit_support.gyp:database', 94 '../webkit/support/webkit_support.gyp:database',
96 '../webkit/support/webkit_support.gyp:fileapi',
97 '../webkit/support/webkit_support.gyp:glue', 95 '../webkit/support/webkit_support.gyp:glue',
98 '../webkit/support/webkit_support.gyp:quota', 96 '../webkit/support/webkit_support.gyp:quota',
99 '../webkit/support/webkit_support.gyp:user_agent', 97 '../webkit/support/webkit_support.gyp:user_agent',
100 '../webkit/support/webkit_support.gyp:webkit_resources', 98 '../webkit/support/webkit_support.gyp:webkit_resources',
99 '../webkit/support/webkit_support.gyp:webkit_storage',
101 ], 100 ],
102 'defines': [ 101 'defines': [
103 '<@(nacl_defines)', 102 '<@(nacl_defines)',
104 ], 103 ],
105 'direct_dependent_settings': { 104 'direct_dependent_settings': {
106 'defines': [ 105 'defines': [
107 '<@(nacl_defines)', 106 '<@(nacl_defines)',
108 ], 107 ],
109 }, 108 },
110 'export_dependent_settings': [ 109 'export_dependent_settings': [
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 'type': 'static_library', 754 'type': 'static_library',
756 'sources': [ 'browser/chromeos/drive/drive.proto' ], 755 'sources': [ 'browser/chromeos/drive/drive.proto' ],
757 'variables': { 756 'variables': {
758 'proto_in_dir': 'browser/chromeos/drive', 757 'proto_in_dir': 'browser/chromeos/drive',
759 'proto_out_dir': 'chrome/browser/chromeos/drive', 758 'proto_out_dir': 'chrome/browser/chromeos/drive',
760 }, 759 },
761 'includes': [ '../build/protoc.gypi' ] 760 'includes': [ '../build/protoc.gypi' ]
762 }, 761 },
763 ], 762 ],
764 } 763 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698