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

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: 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
« no previous file with comments | « no previous file | chrome/chrome_browser_chromeos.gypi » ('j') | webkit/storage/webkit_storage.gypi » ('J')
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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 '../third_party/npapi/npapi.gyp:npapi', 64 '../third_party/npapi/npapi.gyp:npapi',
65 '../third_party/re2/re2.gyp:re2', 65 '../third_party/re2/re2.gyp:re2',
66 '../third_party/zlib/zlib.gyp:zlib', 66 '../third_party/zlib/zlib.gyp:zlib',
67 '../ui/base/strings/ui_strings.gyp:ui_strings', 67 '../ui/base/strings/ui_strings.gyp:ui_strings',
68 '../ui/surface/surface.gyp:surface', 68 '../ui/surface/surface.gyp:surface',
69 '../ui/ui.gyp:ui', 69 '../ui/ui.gyp:ui',
70 '../ui/ui.gyp:ui_resources', 70 '../ui/ui.gyp:ui_resources',
71 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 71 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
72 '../v8/tools/gyp/v8.gyp:v8', 72 '../v8/tools/gyp/v8.gyp:v8',
73 '../webkit/support/webkit_support.gyp:appcache', 73 '../webkit/support/webkit_support.gyp:appcache',
74 '../webkit/support/webkit_support.gyp:blob',
75 '../webkit/support/webkit_support.gyp:database', 74 '../webkit/support/webkit_support.gyp:database',
76 '../webkit/support/webkit_support.gyp:fileapi',
77 '../webkit/support/webkit_support.gyp:glue', 75 '../webkit/support/webkit_support.gyp:glue',
78 '../webkit/support/webkit_support.gyp:quota', 76 '../webkit/support/webkit_support.gyp:quota',
79 '../webkit/support/webkit_support.gyp:user_agent', 77 '../webkit/support/webkit_support.gyp:user_agent',
80 '../webkit/support/webkit_support.gyp:webkit_resources', 78 '../webkit/support/webkit_support.gyp:webkit_resources',
79 '../webkit/support/webkit_support.gyp:webkit_storage',
81 ], 80 ],
82 'include_dirs': [ 81 'include_dirs': [
83 '..', 82 '..',
84 '<(INTERMEDIATE_DIR)', 83 '<(INTERMEDIATE_DIR)',
85 # Needed by pepper_flash_component_installer.cc. 84 # Needed by pepper_flash_component_installer.cc.
86 '<(SHARED_INTERMEDIATE_DIR)', 85 '<(SHARED_INTERMEDIATE_DIR)',
87 ], 86 ],
88 'defines': [ 87 'defines': [
89 '<@(nacl_defines)', 88 '<@(nacl_defines)',
90 ], 89 ],
(...skipping 2729 matching lines...) Expand 10 before | Expand all | Expand 10 after
2820 'variables': { 2819 'variables': {
2821 'jni_gen_dir': 'chrome', 2820 'jni_gen_dir': 'chrome',
2822 }, 2821 },
2823 'includes': [ '../build/jni_generator.gypi' ], 2822 'includes': [ '../build/jni_generator.gypi' ],
2824 }, 2823 },
2825 ], 2824 ],
2826 }, 2825 },
2827 ], 2826 ],
2828 ], 2827 ],
2829 } 2828 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser_chromeos.gypi » ('j') | webkit/storage/webkit_storage.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698