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

Side by Side Diff: chrome/chrome_browser.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 | « no previous file | chrome/chrome_browser_chromeos.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', 9 'target_name': 'browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 '../third_party/npapi/npapi.gyp:npapi', 65 '../third_party/npapi/npapi.gyp:npapi',
66 '../third_party/re2/re2.gyp:re2', 66 '../third_party/re2/re2.gyp:re2',
67 '../third_party/zlib/zlib.gyp:zlib', 67 '../third_party/zlib/zlib.gyp:zlib',
68 '../ui/base/strings/ui_strings.gyp:ui_strings', 68 '../ui/base/strings/ui_strings.gyp:ui_strings',
69 '../ui/surface/surface.gyp:surface', 69 '../ui/surface/surface.gyp:surface',
70 '../ui/ui.gyp:ui', 70 '../ui/ui.gyp:ui',
71 '../ui/ui.gyp:ui_resources', 71 '../ui/ui.gyp:ui_resources',
72 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 72 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
73 '../v8/tools/gyp/v8.gyp:v8', 73 '../v8/tools/gyp/v8.gyp:v8',
74 '../webkit/support/webkit_support.gyp:appcache', 74 '../webkit/support/webkit_support.gyp:appcache',
75 '../webkit/support/webkit_support.gyp:blob',
76 '../webkit/support/webkit_support.gyp:database', 75 '../webkit/support/webkit_support.gyp:database',
77 '../webkit/support/webkit_support.gyp:fileapi',
78 '../webkit/support/webkit_support.gyp:glue', 76 '../webkit/support/webkit_support.gyp:glue',
79 '../webkit/support/webkit_support.gyp:quota', 77 '../webkit/support/webkit_support.gyp:quota',
80 '../webkit/support/webkit_support.gyp:user_agent', 78 '../webkit/support/webkit_support.gyp:user_agent',
81 '../webkit/support/webkit_support.gyp:webkit_resources', 79 '../webkit/support/webkit_support.gyp:webkit_resources',
80 '../webkit/support/webkit_support.gyp:webkit_storage',
82 ], 81 ],
83 'include_dirs': [ 82 'include_dirs': [
84 '..', 83 '..',
85 '<(INTERMEDIATE_DIR)', 84 '<(INTERMEDIATE_DIR)',
86 # Needed by pepper_flash_component_installer.cc. 85 # Needed by pepper_flash_component_installer.cc.
87 '<(SHARED_INTERMEDIATE_DIR)', 86 '<(SHARED_INTERMEDIATE_DIR)',
88 ], 87 ],
89 'defines': [ 88 'defines': [
90 '<@(nacl_defines)', 89 '<@(nacl_defines)',
91 ], 90 ],
(...skipping 2799 matching lines...) Expand 10 before | Expand all | Expand 10 after
2891 'proto_in_dir': '../third_party/cros_system_api/dbus', 2890 'proto_in_dir': '../third_party/cros_system_api/dbus',
2892 'proto_out_dir': 'chrome/browser/media_transfer_protocol', 2891 'proto_out_dir': 'chrome/browser/media_transfer_protocol',
2893 }, 2892 },
2894 'includes': ['../build/protoc.gypi'], 2893 'includes': ['../build/protoc.gypi'],
2895 }, 2894 },
2896 ], 2895 ],
2897 }, 2896 },
2898 ], 2897 ],
2899 ], 2898 ],
2900 } 2899 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698