diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-11 12:52:41 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-13 13:40:31 -0800 |
| commit | 86c8446d3a4390ff6577d070ac8b5fa3ad3c5cd1 (patch) | |
| tree | ef10190d3fca34ff72b2473816901088b0b85ac2 /gyp | |
| parent | 2126e34e52dc5dd94c5a3907b240e62ee17d1e70 (diff) | |
| download | qtlocation-mapboxgl-86c8446d3a4390ff6577d070ac8b5fa3ad3c5cd1.tar.gz | |
[core] Simplify asset:// implementation
* Move asset:// URL handling to DefaultFileSource.
* AssetFileSource implements FileSource interface and follows familiar implementation patterns.
* Move default implementation to platform/default, zip implementation to platform/android.
* Don't bother with modified / expires / etag -- assets are not cached so it doesn't matter.
* Don't bother with interleaving individual IO calls on the implementation thread. That adds a lot of complexity for very little benefit.
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/asset-fs.gypi | 2 | ||||
| -rw-r--r-- | gyp/asset-zip.gypi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gyp/asset-fs.gypi b/gyp/asset-fs.gypi index a4f3f7f4f0..30dc9e07aa 100644 --- a/gyp/asset-fs.gypi +++ b/gyp/asset-fs.gypi @@ -7,7 +7,7 @@ 'hard_dependency': 1, 'sources': [ - '../platform/default/asset_request_fs.cpp', + '../platform/default/asset_file_source.cpp', ], 'include_dirs': [ diff --git a/gyp/asset-zip.gypi b/gyp/asset-zip.gypi index 8a19da4fcd..9011981f6c 100644 --- a/gyp/asset-zip.gypi +++ b/gyp/asset-zip.gypi @@ -7,7 +7,7 @@ 'hard_dependency': 1, 'sources': [ - '../platform/default/asset_request_zip.cpp', + '../platform/android/src/asset_file_source.cpp', ], 'include_dirs': [ |