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

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: Rename 'storage' to 'webkit_storage' 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
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 '../third_party/re2/re2.gyp:re2', 86 '../third_party/re2/re2.gyp:re2',
87 '../third_party/zlib/zlib.gyp:zlib', 87 '../third_party/zlib/zlib.gyp:zlib',
88 '../ui/base/strings/ui_strings.gyp:ui_strings', 88 '../ui/base/strings/ui_strings.gyp:ui_strings',
89 '../ui/surface/surface.gyp:surface', 89 '../ui/surface/surface.gyp:surface',
90 '../ui/ui.gyp:ui', 90 '../ui/ui.gyp:ui',
91 '../ui/ui.gyp:ui_resources', 91 '../ui/ui.gyp:ui_resources',
92 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 92 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
93 '../v8/tools/gyp/v8.gyp:v8', 93 '../v8/tools/gyp/v8.gyp:v8',
94 '../ui/views/controls/webview/webview.gyp:webview', 94 '../ui/views/controls/webview/webview.gyp:webview',
95 '../webkit/support/webkit_support.gyp:appcache', 95 '../webkit/support/webkit_support.gyp:appcache',
96 '../webkit/support/webkit_support.gyp:blob',
97 '../webkit/support/webkit_support.gyp:database', 96 '../webkit/support/webkit_support.gyp:database',
98 '../webkit/support/webkit_support.gyp:fileapi',
99 '../webkit/support/webkit_support.gyp:glue', 97 '../webkit/support/webkit_support.gyp:glue',
100 '../webkit/support/webkit_support.gyp:quota', 98 '../webkit/support/webkit_support.gyp:quota',
101 '../webkit/support/webkit_support.gyp:user_agent', 99 '../webkit/support/webkit_support.gyp:user_agent',
102 '../webkit/support/webkit_support.gyp:webkit_resources', 100 '../webkit/support/webkit_support.gyp:webkit_resources',
101 '../webkit/support/webkit_support.gyp:webkit_storage',
103 ], 102 ],
104 'defines': [ 103 'defines': [
105 '<@(nacl_defines)', 104 '<@(nacl_defines)',
106 ], 105 ],
107 'direct_dependent_settings': { 106 'direct_dependent_settings': {
108 'defines': [ 107 'defines': [
109 '<@(nacl_defines)', 108 '<@(nacl_defines)',
110 ], 109 ],
111 }, 110 },
112 'export_dependent_settings': [ 111 'export_dependent_settings': [
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 'type': 'static_library', 752 'type': 'static_library',
754 'sources': [ 'browser/chromeos/drive/drive.proto' ], 753 'sources': [ 'browser/chromeos/drive/drive.proto' ],
755 'variables': { 754 'variables': {
756 'proto_in_dir': 'browser/chromeos/drive', 755 'proto_in_dir': 'browser/chromeos/drive',
757 'proto_out_dir': 'chrome/browser/chromeos/drive', 756 'proto_out_dir': 'chrome/browser/chromeos/drive',
758 }, 757 },
759 'includes': [ '../build/protoc.gypi' ] 758 'includes': [ '../build/protoc.gypi' ]
760 }, 759 },
761 ], 760 ],
762 } 761 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698