| Index: webkit/storage/webkit_storage.gypi
|
| diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi
|
| index 344a2f10bfeeb2f11e417880195a7e5a8db38eef..a5cfed3f6dbdcf43dd13f22efa3025b33b58a6f9 100644
|
| --- a/webkit/storage/webkit_storage.gypi
|
| +++ b/webkit/storage/webkit_storage.gypi
|
| @@ -1,69 +1,69 @@
|
| -# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -# Use of this source code is governed by a BSD-style license that can be
|
| -# found in the LICENSE file.
|
| -
|
| -{
|
| - 'variables': {
|
| - 'conditions': [
|
| - ['inside_chromium_build==0', {
|
| - 'webkit_src_dir': '../../../../..',
|
| - },{
|
| - 'webkit_src_dir': '../../third_party/WebKit',
|
| - }],
|
| - ],
|
| - },
|
| - 'includes': [
|
| - '../appcache/webkit_appcache.gypi',
|
| - '../blob/webkit_blob.gypi',
|
| - '../database/webkit_database.gypi',
|
| - '../dom_storage/webkit_dom_storage.gypi',
|
| - '../fileapi/webkit_fileapi.gypi',
|
| - '../quota/webkit_quota.gypi',
|
| - ],
|
| - 'targets': [
|
| - {
|
| - 'target_name': 'webkit_storage',
|
| - 'type': '<(component)',
|
| - 'variables': { 'enable_wexit_time_destructors': 1, },
|
| - 'dependencies': [
|
| - '<(DEPTH)/base/base.gyp:base',
|
| - '<(DEPTH)/base/base.gyp:base_i18n',
|
| - '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| - '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
|
| - '<(DEPTH)/net/net.gyp:net',
|
| - '<(DEPTH)/sql/sql.gyp:sql',
|
| - '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
|
| - '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
|
| - '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
|
| - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
|
| - ],
|
| - 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
|
| - 'sources': [
|
| - '../storage/webkit_storage_export.h',
|
| - '<@(webkit_appcache_sources)',
|
| - '<@(webkit_blob_sources)',
|
| - '<@(webkit_database_sources)',
|
| - '<@(webkit_dom_storage_sources)',
|
| - '<@(webkit_fileapi_sources)',
|
| - '<@(webkit_quota_sources)',
|
| - ],
|
| - 'conditions': [
|
| - ['inside_chromium_build==0', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
|
| - ],
|
| - }],
|
| - ['chromeos==1', {
|
| - 'sources': [
|
| - '<@(webkit_fileapi_chromeos_sources)',
|
| - ],
|
| - }],
|
| - ['OS=="linux" or chromeos==1', {
|
| - 'sources': [
|
| - '<@(webkit_fileapi_media_sources)',
|
| - ],
|
| - }],
|
| - ],
|
| - },
|
| - ],
|
| -}
|
| +# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +# Use of this source code is governed by a BSD-style license that can be
|
| +# found in the LICENSE file.
|
| +
|
| +{
|
| + 'variables': {
|
| + 'conditions': [
|
| + ['inside_chromium_build==0', {
|
| + 'webkit_src_dir': '../../../../..',
|
| + },{
|
| + 'webkit_src_dir': '../../third_party/WebKit',
|
| + }],
|
| + ],
|
| + },
|
| + 'includes': [
|
| + '../appcache/webkit_appcache.gypi',
|
| + '../blob/webkit_blob.gypi',
|
| + '../database/webkit_database.gypi',
|
| + '../dom_storage/webkit_dom_storage.gypi',
|
| + '../fileapi/webkit_fileapi.gypi',
|
| + '../quota/webkit_quota.gypi',
|
| + ],
|
| + 'targets': [
|
| + {
|
| + 'target_name': 'webkit_storage',
|
| + 'type': '<(component)',
|
| + 'variables': { 'enable_wexit_time_destructors': 1, },
|
| + 'dependencies': [
|
| + '<(DEPTH)/base/base.gyp:base',
|
| + '<(DEPTH)/base/base.gyp:base_i18n',
|
| + '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| + '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
|
| + '<(DEPTH)/net/net.gyp:net',
|
| + '<(DEPTH)/sql/sql.gyp:sql',
|
| + '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
|
| + '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
|
| + '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
|
| + '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
|
| + ],
|
| + 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
|
| + 'sources': [
|
| + '../storage/webkit_storage_export.h',
|
| + '<@(webkit_appcache_sources)',
|
| + '<@(webkit_blob_sources)',
|
| + '<@(webkit_database_sources)',
|
| + '<@(webkit_dom_storage_sources)',
|
| + '<@(webkit_fileapi_sources)',
|
| + '<@(webkit_quota_sources)',
|
| + ],
|
| + 'conditions': [
|
| + ['inside_chromium_build==0', {
|
| + 'dependencies': [
|
| + '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
|
| + ],
|
| + }],
|
| + ['chromeos==1', {
|
| + 'sources': [
|
| + '<@(webkit_fileapi_chromeos_sources)',
|
| + ],
|
| + }],
|
| + ['OS=="linux" or chromeos==1 or OS=="win"', {
|
| + 'sources': [
|
| + '<@(webkit_fileapi_media_sources)',
|
| + ],
|
| + }],
|
| + ],
|
| + },
|
| + ],
|
| +}
|
|
|