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

Unified Diff: webkit/blob/webkit_blob.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 side-by-side diff with in-line comments
Download patch
Index: webkit/blob/webkit_blob.gypi
diff --git a/webkit/blob/webkit_blob.gypi b/webkit/blob/webkit_blob.gypi
deleted file mode 100644
index 0e786c4f97a76383a1f1f79cdc9ed0253ea07fa9..0000000000000000000000000000000000000000
--- a/webkit/blob/webkit_blob.gypi
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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',
- }],
- ],
- },
- 'targets': [
- {
- 'target_name': 'blob',
- '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)/webkit/support/webkit_support.gyp:webkit_base',
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
- ],
- 'defines': [
- 'BLOB_IMPLEMENTATION'
- ],
- 'sources': [
- 'blob_data.cc',
- 'blob_data.h',
- 'blob_storage_controller.cc',
- 'blob_storage_controller.h',
- 'blob_url_request_job.cc',
- 'blob_url_request_job.h',
- 'blob_url_request_job_factory.cc',
- 'blob_url_request_job_factory.h',
- 'local_file_stream_reader.cc',
- 'local_file_stream_reader.h',
- 'shareable_file_reference.cc',
- 'shareable_file_reference.h',
- 'view_blob_internals_job.cc',
- 'view_blob_internals_job.h',
- ],
- 'conditions': [
- ['inside_chromium_build==0', {
- 'dependencies': [
- '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
- ],
- }],
- ],
- },
- ],
-}

Powered by Google App Engine
This is Rietveld 408576698