webkit: Merge blob and fileapi into one build target 'storage'

webkit/storage/webkit_storage.gypi

Index: webkit/storage/webkit_storage.gypi
diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/storage/webkit_storage.gypi
similarity index 22%
rename from webkit/fileapi/webkit_fileapi.gypi
rename to webkit/storage/webkit_storage.gypi
index 0938b1251a477eea32c50a5ca6606c70683c605a..9deff0dcb79ae283f0e6b18d424a7edde7129723 100644
--- a/webkit/fileapi/webkit_fileapi.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -3,112 +3,139 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'conditions': [
+      ['inside_chromium_build==0', {
+        'webkit_src_dir': '../../../../..',
+      },{
+        'webkit_src_dir': '../../third_party/WebKit',
+      }],
+    ],
+  },
   'targets': [
     {
-      'target_name': 'fileapi',
+      '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)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:blob',
         '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
-      'defines': ['FILEAPI_IMPLEMENTATION'],
+      'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
       'sources': [
-        'file_observers.h',
-        'file_stream_writer.h',
-        'file_system_callback_dispatcher.cc',
-        'file_system_callback_dispatcher.h',
-        'file_system_context.cc',
-        'file_system_context.h',
-        'file_system_dir_url_request_job.cc',
-        'file_system_dir_url_request_job.h',
-        'file_system_directory_database.cc',
-        'file_system_directory_database.h',
-        'file_system_file_stream_reader.cc',
-        'file_system_file_stream_reader.h',
-        'file_system_file_util.cc',
-        'file_system_file_util.h',
-        'file_system_file_util_proxy.cc',
-        'file_system_file_util_proxy.h',
-        'file_system_mount_point_provider.h',
-        'file_system_operation.h',
-        'file_system_operation_context.cc',
-        'file_system_operation_context.h',
-        'file_system_options.cc',
-        'file_system_options.h',
-        'file_system_origin_database.cc',
-        'file_system_origin_database.h',
-        'file_system_quota_client.cc',
-        'file_system_quota_client.h',
-        'file_system_quota_util.h',
-        'file_system_task_runners.cc',
-        'file_system_task_runners.h',
-        'file_system_types.h',
-        'file_system_url.cc',
-        'file_system_url.h',
-        'file_system_url_request_job.cc',
-        'file_system_url_request_job.h',
-        'file_system_url_request_job_factory.cc',
-        'file_system_url_request_job_factory.h',
-        'file_system_usage_cache.cc',
-        'file_system_usage_cache.h',
-        'file_system_util.cc',
-        'file_system_util.h',
-        'file_util_helper.cc',
-        'file_util_helper.h',
-        'file_writer_delegate.cc',
-        'file_writer_delegate.h',
-        'isolated_context.cc',
-        'isolated_context.h',
-        'isolated_file_util.cc',
-        'isolated_file_util.h',
-        'isolated_mount_point_provider.cc',
-        'isolated_mount_point_provider.h',
-        'local_file_util.cc',
-        'local_file_util.h',
-        'local_file_stream_writer.cc',
-        'local_file_stream_writer.h',
-        'local_file_system_operation.cc',
-        'local_file_system_operation.h',
-        'media/filtering_file_enumerator.cc',
-        'media/filtering_file_enumerator.h',
-        'media/media_path_filter.cc',
-        'media/media_path_filter.h',
-        'media/mtp_device_file_system_config.h',
-        'media/native_media_file_util.cc',
-        'media/native_media_file_util.h',
-        'native_file_util.cc',
-        'native_file_util.h',
-        'obfuscated_file_util.cc',
-        'obfuscated_file_util.h',
-        'sandbox_file_stream_writer.cc',
-        'sandbox_file_stream_writer.h',
-        'sandbox_mount_point_provider.cc',
-        'sandbox_mount_point_provider.h',
-        'sandbox_quota_observer.cc',
-        'sandbox_quota_observer.h',
-        'syncable/file_change.cc',
-        'syncable/file_change.h',
-        'syncable/local_file_change_tracker.cc',
-        'syncable/local_file_change_tracker.h',
-        'syncable/local_file_sync_context.cc',
-        'syncable/local_file_sync_context.h',
-        'syncable/local_file_sync_status.cc',
-        'syncable/local_file_sync_status.h',
-        'syncable/sync_status_code.cc',
-        'syncable/sync_status_code.h',
-        'syncable/syncable_file_system_util.cc',
-        'syncable/syncable_file_system_util.h',
-        'task_runner_bound_observer_list.h',
-        'test_mount_point_provider.cc',
-        'test_mount_point_provider.h',
-        'webfilewriter_base.cc',
-        'webfilewriter_base.h',
+        # TODO(hashimoto): Import all storage related modules. crbug.com/155242
+        '../blob/blob_data.cc',

[tony, 2012/10/17 16:58:10]

Would it be possible to keep a gypi file in each subdirectory that only defines
a variable that lists all the files in that directory?  E.g., there would be a
webkit_blob.gypi and a webkit_fileapi.gypi.  webkit_storage.gypi would include
the other files and sources would reference the variable from the other gypi
files.

The benefit is that it would be easy to find the .gypi file to add a new to
(it's not obvious that files in webkit/fileapi are listed in webkit/storage).

[hashimoto, 2012/10/18 05:16:06]

Done.

+        '../blob/blob_data.h',
+        '../blob/blob_storage_controller.cc',
+        '../blob/blob_storage_controller.h',
+        '../blob/blob_url_request_job.cc',
+        '../blob/blob_url_request_job.h',
+        '../blob/blob_url_request_job_factory.cc',
+        '../blob/blob_url_request_job_factory.h',
+        '../blob/local_file_stream_reader.cc',
+        '../blob/local_file_stream_reader.h',
+        '../blob/shareable_file_reference.cc',
+        '../blob/shareable_file_reference.h',
+        '../blob/view_blob_internals_job.cc',
+        '../blob/view_blob_internals_job.h',
+        '../fileapi/file_observers.h',
+        '../fileapi/file_stream_writer.h',
+        '../fileapi/file_system_callback_dispatcher.cc',
+        '../fileapi/file_system_callback_dispatcher.h',
+        '../fileapi/file_system_context.cc',
+        '../fileapi/file_system_context.h',
+        '../fileapi/file_system_dir_url_request_job.cc',
+        '../fileapi/file_system_dir_url_request_job.h',
+        '../fileapi/file_system_directory_database.cc',
+        '../fileapi/file_system_directory_database.h',
+        '../fileapi/file_system_file_stream_reader.cc',
+        '../fileapi/file_system_file_stream_reader.h',
+        '../fileapi/file_system_file_util.cc',
+        '../fileapi/file_system_file_util.h',
+        '../fileapi/file_system_file_util_proxy.cc',
+        '../fileapi/file_system_file_util_proxy.h',
+        '../fileapi/file_system_mount_point_provider.h',
+        '../fileapi/file_system_operation.h',
+        '../fileapi/file_system_operation_context.cc',
+        '../fileapi/file_system_operation_context.h',
+        '../fileapi/file_system_options.cc',
+        '../fileapi/file_system_options.h',
+        '../fileapi/file_system_origin_database.cc',
+        '../fileapi/file_system_origin_database.h',
+        '../fileapi/file_system_quota_client.cc',
+        '../fileapi/file_system_quota_client.h',
+        '../fileapi/file_system_quota_util.h',
+        '../fileapi/file_system_task_runners.cc',
+        '../fileapi/file_system_task_runners.h',
+        '../fileapi/file_system_types.h',
+        '../fileapi/file_system_url.cc',
+        '../fileapi/file_system_url.h',
+        '../fileapi/file_system_url_request_job.cc',
+        '../fileapi/file_system_url_request_job.h',
+        '../fileapi/file_system_url_request_job_factory.cc',
+        '../fileapi/file_system_url_request_job_factory.h',
+        '../fileapi/file_system_usage_cache.cc',
+        '../fileapi/file_system_usage_cache.h',
+        '../fileapi/file_system_util.cc',
+        '../fileapi/file_system_util.h',
+        '../fileapi/file_util_helper.cc',
+        '../fileapi/file_util_helper.h',
+        '../fileapi/file_writer_delegate.cc',
+        '../fileapi/file_writer_delegate.h',
+        '../fileapi/isolated_context.cc',
+        '../fileapi/isolated_context.h',
+        '../fileapi/isolated_file_util.cc',
+        '../fileapi/isolated_file_util.h',
+        '../fileapi/isolated_mount_point_provider.cc',
+        '../fileapi/isolated_mount_point_provider.h',
+        '../fileapi/local_file_util.cc',
+        '../fileapi/local_file_util.h',
+        '../fileapi/local_file_stream_writer.cc',
+        '../fileapi/local_file_stream_writer.h',
+        '../fileapi/local_file_system_operation.cc',
+        '../fileapi/local_file_system_operation.h',
+        '../fileapi/media/filtering_file_enumerator.cc',
+        '../fileapi/media/filtering_file_enumerator.h',
+        '../fileapi/media/media_path_filter.cc',
+        '../fileapi/media/media_path_filter.h',
+        '../fileapi/media/mtp_device_file_system_config.h',
+        '../fileapi/media/native_media_file_util.cc',
+        '../fileapi/media/native_media_file_util.h',
+        '../fileapi/native_file_util.cc',
+        '../fileapi/native_file_util.h',
+        '../fileapi/obfuscated_file_util.cc',
+        '../fileapi/obfuscated_file_util.h',
+        '../fileapi/sandbox_file_stream_writer.cc',
+        '../fileapi/sandbox_file_stream_writer.h',
+        '../fileapi/sandbox_mount_point_provider.cc',
+        '../fileapi/sandbox_mount_point_provider.h',
+        '../fileapi/sandbox_quota_observer.cc',
+        '../fileapi/sandbox_quota_observer.h',
+        '../fileapi/syncable/file_change.cc',
+        '../fileapi/syncable/file_change.h',
+        '../fileapi/syncable/local_file_change_tracker.cc',
+        '../fileapi/syncable/local_file_change_tracker.h',
+        '../fileapi/syncable/local_file_sync_context.cc',
+        '../fileapi/syncable/local_file_sync_context.h',
+        '../fileapi/syncable/local_file_sync_status.cc',
+        '../fileapi/syncable/local_file_sync_status.h',
+        '../fileapi/syncable/sync_status_code.cc',
+        '../fileapi/syncable/sync_status_code.h',
+        '../fileapi/syncable/syncable_file_system_util.cc',
+        '../fileapi/syncable/syncable_file_system_util.h',
+        '../fileapi/task_runner_bound_observer_list.h',
+        '../fileapi/test_mount_point_provider.cc',
+        '../fileapi/test_mount_point_provider.h',
+        '../fileapi/webfilewriter_base.cc',
+        '../fileapi/webfilewriter_base.h',
+        '../storage/webkit_storage_export.h',
       ],
       'conditions': [
         ['inside_chromium_build==0', {
@@ -133,11 +160,11 @@
         }],
         ['OS=="linux" or chromeos==1', {
           'sources': [
-            'media/device_media_file_util.cc',
-            'media/device_media_file_util.h',
-            'media/mtp_device_delegate.h',
-            'media/mtp_device_map_service.cc',
-            'media/mtp_device_map_service.h',
+            '../fileapi/media/device_media_file_util.cc',
+            '../fileapi/media/device_media_file_util.h',
+            '../fileapi/media/mtp_device_delegate.h',
+            '../fileapi/media/mtp_device_map_service.cc',
+            '../fileapi/media/mtp_device_map_service.h',
           ],
         }],
       ],