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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/fileapi/webkit_fileapi.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: Leave *.gypi files in blob and fileapi 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
« no previous file with comments | « webkit/fileapi/webfilewriter_base.h ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/webkit_fileapi.gypi
diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi
index 0938b1251a477eea32c50a5ca6606c70683c605a..6a0e20cbf4ad1b087395a05380be82224d1cf32e 100644
--- a/webkit/fileapi/webkit_fileapi.gypi
+++ b/webkit/fileapi/webkit_fileapi.gypi
@@ -3,144 +3,118 @@
# found in the LICENSE file.
{
- 'targets': [
- {
- 'target_name': 'fileapi',
- 'type': '<(component)',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'dependencies': [
- '<(DEPTH)/base/base.gyp:base',
- '<(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',
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
- ],
- 'defines': ['FILEAPI_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',
- ],
- 'conditions': [
- ['inside_chromium_build==0', {
- 'dependencies': [
- '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
- ],
- }],
- ['chromeos==1', {
- 'sources': [
- '../chromeos/fileapi/async_file_stream.h',
- '../chromeos/fileapi/cros_mount_point_provider.cc',
- '../chromeos/fileapi/cros_mount_point_provider.h',
- '../chromeos/fileapi/file_access_permissions.cc',
- '../chromeos/fileapi/file_access_permissions.h',
- '../chromeos/fileapi/file_util_async.h',
- '../chromeos/fileapi/remote_file_system_operation.cc',
- '../chromeos/fileapi/remote_file_system_operation.h',
- '../chromeos/fileapi/remote_file_system_proxy.h',
- '../chromeos/fileapi/remote_file_stream_writer.cc',
- '../chromeos/fileapi/remote_file_stream_writer.h',
- ],
- }],
- ['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',
- ],
- }],
- ],
- },
- ],
+ 'variables': {
+ 'webkit_fileapi_sources': [
+ '../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',
+ ],
+ 'webkit_fileapi_chromeos_sources': [
+ '../chromeos/fileapi/async_file_stream.h',
+ '../chromeos/fileapi/cros_mount_point_provider.cc',
+ '../chromeos/fileapi/cros_mount_point_provider.h',
+ '../chromeos/fileapi/file_access_permissions.cc',
+ '../chromeos/fileapi/file_access_permissions.h',
+ '../chromeos/fileapi/file_util_async.h',
+ '../chromeos/fileapi/remote_file_system_operation.cc',
+ '../chromeos/fileapi/remote_file_system_operation.h',
+ '../chromeos/fileapi/remote_file_system_proxy.h',
+ '../chromeos/fileapi/remote_file_stream_writer.cc',
+ '../chromeos/fileapi/remote_file_stream_writer.h',
+ ],
+ 'webkit_fileapi_media_sources': [
+ '../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',
+ ],
+ },
}
« no previous file with comments | « webkit/fileapi/webfilewriter_base.h ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698