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

Side by Side Diff: content/content_common.gypi

Issue 11274003: webkit: Merge 'database' and 'quota' to 'webkit_storage' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More EXPORT for Win Created 8 years, 1 month 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_ui.gypi ('k') | content/content_tests.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 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../build/temp_gyp/googleurl.gyp:googleurl', 8 '../build/temp_gyp/googleurl.gyp:googleurl',
9 '../media/media.gyp:media', 9 '../media/media.gyp:media',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 }, { # OS!="ios" 407 }, { # OS!="ios"
408 'dependencies': [ 408 'dependencies': [
409 '../gpu/gpu.gyp:gles2_implementation', 409 '../gpu/gpu.gyp:gles2_implementation',
410 '../gpu/gpu.gyp:gpu_ipc', 410 '../gpu/gpu.gyp:gpu_ipc',
411 '../ipc/ipc.gyp:ipc', 411 '../ipc/ipc.gyp:ipc',
412 '../media/media.gyp:shared_memory_support', 412 '../media/media.gyp:shared_memory_support',
413 '../ppapi/ppapi_internal.gyp:ppapi_shared', 413 '../ppapi/ppapi_internal.gyp:ppapi_shared',
414 '../third_party/npapi/npapi.gyp:npapi', 414 '../third_party/npapi/npapi.gyp:npapi',
415 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 415 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
416 '../ui/gl/gl.gyp:gl', 416 '../ui/gl/gl.gyp:gl',
417 '../webkit/support/webkit_support.gyp:database',
418 '../webkit/support/webkit_support.gyp:webkit_base', 417 '../webkit/support/webkit_support.gyp:webkit_base',
419 '../webkit/support/webkit_support.gyp:webkit_storage', 418 '../webkit/support/webkit_support.gyp:webkit_storage',
420 ], 419 ],
421 }], 420 }],
422 ['OS!="win"', { 421 ['OS!="win"', {
423 'sources!': [ 422 'sources!': [
424 'common/sandbox_policy.cc', 423 'common/sandbox_policy.cc',
425 'common/sandbox_policy.h', 424 'common/sandbox_policy.h',
426 ], 425 ],
427 }], 426 }],
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 '../build/extract_from_cab.py', 554 '../build/extract_from_cab.py',
556 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 555 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
557 '<(output)', 556 '<(output)',
558 '<(PRODUCT_DIR)', 557 '<(PRODUCT_DIR)',
559 ], 558 ],
560 }, 559 },
561 ] 560 ]
562 }], 561 }],
563 ], 562 ],
564 } 563 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698