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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 121643003: Reorganize net/disk_cache into backend specific directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ios breakage Created 6 years, 10 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 | « net/disk_cache/v3/sparse_control_v3.cc ('k') | net/tools/crash_cache/crash_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index cc6a1f61952c09d72f738df891168c942b819ba2..1a9b78edda474a8a5e1bf3b84d44bba03c3bfe41 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -349,70 +349,93 @@
'cookies/cookie_util.h',
'cookies/parsed_cookie.cc',
'cookies/parsed_cookie.h',
- 'disk_cache/addr.cc',
- 'disk_cache/addr.h',
- 'disk_cache/backend_impl.cc',
- 'disk_cache/backend_impl.h',
- 'disk_cache/bitmap.cc',
- 'disk_cache/bitmap.h',
- 'disk_cache/block_files.cc',
- 'disk_cache/block_files.h',
+ 'disk_cache/blockfile/addr.cc',
+ 'disk_cache/blockfile/addr.h',
+ 'disk_cache/blockfile/backend_impl.cc',
+ 'disk_cache/blockfile/backend_impl.h',
+ 'disk_cache/blockfile/backend_impl_v3.cc',
+ 'disk_cache/blockfile/backend_impl_v3.h',
+ 'disk_cache/blockfile/bitmap.cc',
+ 'disk_cache/blockfile/bitmap.h',
+ 'disk_cache/blockfile/block_bitmaps_v3.cc',
+ 'disk_cache/blockfile/block_bitmaps_v3.h',
+ 'disk_cache/blockfile/block_files.cc',
+ 'disk_cache/blockfile/block_files.h',
+ 'disk_cache/blockfile/disk_format.cc',
+ 'disk_cache/blockfile/disk_format.h',
+ 'disk_cache/blockfile/disk_format_base.h',
+ 'disk_cache/blockfile/disk_format_v3.h',
+ 'disk_cache/blockfile/entry_impl.cc',
+ 'disk_cache/blockfile/entry_impl.h',
+ 'disk_cache/blockfile/entry_impl_v3.cc',
+ 'disk_cache/blockfile/entry_impl_v3.h',
+ 'disk_cache/blockfile/errors.h',
+ 'disk_cache/blockfile/eviction.cc',
+ 'disk_cache/blockfile/eviction.h',
+ 'disk_cache/blockfile/eviction_v3.cc',
+ 'disk_cache/blockfile/eviction_v3.h',
+ 'disk_cache/blockfile/experiments.h',
+ 'disk_cache/blockfile/file.cc',
+ 'disk_cache/blockfile/file.h',
+ 'disk_cache/blockfile/file_block.h',
+ 'disk_cache/blockfile/file_ios.cc',
+ 'disk_cache/blockfile/file_lock.cc',
+ 'disk_cache/blockfile/file_lock.h',
+ 'disk_cache/blockfile/file_posix.cc',
+ 'disk_cache/blockfile/file_win.cc',
+ 'disk_cache/blockfile/histogram_macros.h',
+ 'disk_cache/blockfile/histogram_macros_v3.h',
+ 'disk_cache/blockfile/in_flight_backend_io.cc',
+ 'disk_cache/blockfile/in_flight_backend_io.h',
+ 'disk_cache/blockfile/in_flight_io.cc',
+ 'disk_cache/blockfile/in_flight_io.h',
+ 'disk_cache/blockfile/index_table_v3.cc',
+ 'disk_cache/blockfile/index_table_v3.h',
+ 'disk_cache/blockfile/mapped_file.cc',
+ 'disk_cache/blockfile/mapped_file.h',
+ 'disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc',
+ 'disk_cache/blockfile/mapped_file_posix.cc',
+ 'disk_cache/blockfile/mapped_file_win.cc',
+ 'disk_cache/blockfile/rankings.cc',
+ 'disk_cache/blockfile/rankings.h',
+ 'disk_cache/blockfile/sparse_control.cc',
+ 'disk_cache/blockfile/sparse_control.h',
+ 'disk_cache/blockfile/stats.cc',
+ 'disk_cache/blockfile/stats.h',
+ 'disk_cache/blockfile/stats_histogram.cc',
+ 'disk_cache/blockfile/stats_histogram.h',
+ 'disk_cache/blockfile/storage_block-inl.h',
+ 'disk_cache/blockfile/storage_block.h',
+ 'disk_cache/blockfile/stress_support.h',
+ 'disk_cache/blockfile/trace.cc',
+ 'disk_cache/blockfile/trace.h',
'disk_cache/cache_creator.cc',
- 'disk_cache/cache_util.h',
'disk_cache/cache_util.cc',
+ 'disk_cache/cache_util.h',
'disk_cache/cache_util_posix.cc',
'disk_cache/cache_util_win.cc',
'disk_cache/disk_cache.h',
- 'disk_cache/disk_format.cc',
- 'disk_cache/disk_format.h',
- 'disk_cache/disk_format_base.h',
- 'disk_cache/entry_impl.cc',
- 'disk_cache/entry_impl.h',
- 'disk_cache/errors.h',
- 'disk_cache/eviction.cc',
- 'disk_cache/eviction.h',
- 'disk_cache/experiments.h',
- 'disk_cache/file.cc',
- 'disk_cache/file.h',
- 'disk_cache/file_block.h',
- 'disk_cache/file_ios.cc',
- 'disk_cache/file_lock.cc',
- 'disk_cache/file_lock.h',
- 'disk_cache/file_posix.cc',
- 'disk_cache/file_win.cc',
- 'disk_cache/histogram_macros.h',
- 'disk_cache/in_flight_backend_io.cc',
- 'disk_cache/in_flight_backend_io.h',
- 'disk_cache/in_flight_io.cc',
- 'disk_cache/in_flight_io.h',
- 'disk_cache/mapped_file.cc',
- 'disk_cache/mapped_file.h',
- 'disk_cache/mapped_file_posix.cc',
- 'disk_cache/mapped_file_avoid_mmap_posix.cc',
- 'disk_cache/mapped_file_win.cc',
- 'disk_cache/mem_backend_impl.cc',
- 'disk_cache/mem_backend_impl.h',
- 'disk_cache/mem_entry_impl.cc',
- 'disk_cache/mem_entry_impl.h',
- 'disk_cache/mem_rankings.cc',
- 'disk_cache/mem_rankings.h',
+ 'disk_cache/flash/flash_entry_impl.cc',
+ 'disk_cache/flash/flash_entry_impl.h',
+ 'disk_cache/flash/format.h',
+ 'disk_cache/flash/internal_entry.cc',
+ 'disk_cache/flash/internal_entry.h',
+ 'disk_cache/flash/log_store.cc',
+ 'disk_cache/flash/log_store.h',
+ 'disk_cache/flash/log_store_entry.cc',
+ 'disk_cache/flash/log_store_entry.h',
+ 'disk_cache/flash/segment.cc',
+ 'disk_cache/flash/segment.h',
+ 'disk_cache/flash/storage.cc',
+ 'disk_cache/flash/storage.h',
+ 'disk_cache/memory/mem_backend_impl.cc',
+ 'disk_cache/memory/mem_backend_impl.h',
+ 'disk_cache/memory/mem_entry_impl.cc',
+ 'disk_cache/memory/mem_entry_impl.h',
+ 'disk_cache/memory/mem_rankings.cc',
+ 'disk_cache/memory/mem_rankings.h',
'disk_cache/net_log_parameters.cc',
'disk_cache/net_log_parameters.h',
- 'disk_cache/rankings.cc',
- 'disk_cache/rankings.h',
- 'disk_cache/sparse_control.cc',
- 'disk_cache/sparse_control.h',
- 'disk_cache/stats.cc',
- 'disk_cache/stats.h',
- 'disk_cache/stats_histogram.cc',
- 'disk_cache/stats_histogram.h',
- 'disk_cache/storage_block-inl.h',
- 'disk_cache/storage_block.h',
- 'disk_cache/stress_support.h',
- 'disk_cache/trace.cc',
- 'disk_cache/trace.h',
- 'disk_cache/tracing_cache_backend.cc',
- 'disk_cache/tracing_cache_backend.h',
'disk_cache/simple/simple_backend_impl.cc',
'disk_cache/simple/simple_backend_impl.h',
'disk_cache/simple/simple_backend_version.h',
@@ -439,31 +462,8 @@
'disk_cache/simple/simple_util.h',
'disk_cache/simple/simple_version_upgrade.cc',
'disk_cache/simple/simple_version_upgrade.h',
- 'disk_cache/flash/flash_entry_impl.cc',
- 'disk_cache/flash/flash_entry_impl.h',
- 'disk_cache/flash/format.h',
- 'disk_cache/flash/internal_entry.cc',
- 'disk_cache/flash/internal_entry.h',
- 'disk_cache/flash/log_store.cc',
- 'disk_cache/flash/log_store.h',
- 'disk_cache/flash/log_store_entry.cc',
- 'disk_cache/flash/log_store_entry.h',
- 'disk_cache/flash/segment.cc',
- 'disk_cache/flash/segment.h',
- 'disk_cache/flash/storage.cc',
- 'disk_cache/flash/storage.h',
- 'disk_cache/v3/backend_impl_v3.cc',
- 'disk_cache/v3/backend_impl_v3.h',
- 'disk_cache/v3/block_bitmaps.cc',
- 'disk_cache/v3/block_bitmaps.h',
- 'disk_cache/v3/disk_format_v3.h',
- 'disk_cache/v3/entry_impl_v3.cc',
- 'disk_cache/v3/entry_impl_v3.h',
- 'disk_cache/v3/eviction_v3.cc',
- 'disk_cache/v3/eviction_v3.h',
- 'disk_cache/v3/histogram_macros.h',
- 'disk_cache/v3/index_table.cc',
- 'disk_cache/v3/index_table.h',
+ 'disk_cache/tracing/tracing_cache_backend.cc',
+ 'disk_cache/tracing/tracing_cache_backend.h',
'dns/address_sorter.h',
'dns/address_sorter_posix.cc',
'dns/address_sorter_posix.h',
@@ -1317,11 +1317,11 @@
],
},
'sources!': [
- 'disk_cache/mapped_file_posix.cc',
+ 'disk_cache/blockfile/mapped_file_posix.cc',
],
}, { # else
'sources!': [
- 'disk_cache/mapped_file_avoid_mmap_posix.cc',
+ 'disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc',
],
}],
['disable_ftp_support==1', {
@@ -1714,26 +1714,27 @@
'cookies/cookie_store_unittest.h',
'cookies/cookie_util_unittest.cc',
'cookies/parsed_cookie_unittest.cc',
- 'disk_cache/addr_unittest.cc',
'disk_cache/backend_unittest.cc',
- 'disk_cache/bitmap_unittest.cc',
- 'disk_cache/block_files_unittest.cc',
+ 'disk_cache/blockfile/addr_unittest.cc',
+ 'disk_cache/blockfile/bitmap_unittest.cc',
+ 'disk_cache/blockfile/block_bitmaps_v3_unittest.cc',
+ 'disk_cache/blockfile/block_bitmaps_v3_unittest.cc',
+ 'disk_cache/blockfile/block_files_unittest.cc',
+ 'disk_cache/blockfile/index_table_v3_unittest.cc',
+ 'disk_cache/blockfile/mapped_file_unittest.cc',
+ 'disk_cache/blockfile/storage_block_unittest.cc',
'disk_cache/cache_util_unittest.cc',
'disk_cache/entry_unittest.cc',
- 'disk_cache/mapped_file_unittest.cc',
+ 'disk_cache/flash/log_store_entry_unittest.cc',
+ 'disk_cache/flash/log_store_unittest.cc',
+ 'disk_cache/flash/segment_unittest.cc',
+ 'disk_cache/flash/storage_unittest.cc',
'disk_cache/simple/simple_index_file_unittest.cc',
'disk_cache/simple/simple_index_unittest.cc',
- 'disk_cache/simple/simple_test_util.h',
'disk_cache/simple/simple_test_util.cc',
+ 'disk_cache/simple/simple_test_util.h',
'disk_cache/simple/simple_util_unittest.cc',
'disk_cache/simple/simple_version_upgrade_unittest.cc',
- 'disk_cache/storage_block_unittest.cc',
- 'disk_cache/flash/log_store_entry_unittest.cc',
- 'disk_cache/flash/log_store_unittest.cc',
- 'disk_cache/flash/segment_unittest.cc',
- 'disk_cache/flash/storage_unittest.cc',
- 'disk_cache/v3/block_bitmaps_unittest.cc',
- 'disk_cache/v3/index_table_unittest.cc',
'dns/address_sorter_posix_unittest.cc',
'dns/address_sorter_unittest.cc',
'dns/dns_config_service_posix_unittest.cc',
@@ -2147,7 +2148,7 @@
[ 'OS == "android"', {
'sources!': [
# See bug 344533.
- 'disk_cache/v3/index_table_unittest.cc',
+ 'disk_cache/blockfile/index_table_v3unittest.cc',
# No res_ninit() et al on Android, so this doesn't make a lot of
# sense.
'dns/dns_config_service_posix_unittest.cc',
@@ -2397,7 +2398,7 @@
],
'sources': [
'cookies/cookie_monster_perftest.cc',
- 'disk_cache/disk_cache_perftest.cc',
+ 'disk_cache/blockfile/disk_cache_perftest.cc',
'proxy/proxy_resolver_perftest.cc',
],
'conditions': [
@@ -2825,7 +2826,7 @@
'net_test_support',
],
'sources': [
- 'disk_cache/stress_cache.cc',
+ 'disk_cache/blockfile/stress_cache.cc',
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [4267, ],
« no previous file with comments | « net/disk_cache/v3/sparse_control_v3.cc ('k') | net/tools/crash_cache/crash_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698