diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-11 15:00:56 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-13 13:40:31 -0800 |
| commit | 5a7d2fd60ec4bd1639a1223ec5d2c54c534d0392 (patch) | |
| tree | d37991995bd21955379e690b677fc288109aa2c1 /gyp | |
| parent | 86c8446d3a4390ff6577d070ac8b5fa3ad3c5cd1 (diff) | |
| download | qtlocation-mapboxgl-5a7d2fd60ec4bd1639a1223ec5d2c54c534d0392.tar.gz | |
[core] Eliminate platform::assetRoot()
I regenerated assets.zip so that all file paths have an `assets/` prefix, as the Android AssetFileSource implementation asserts, and removed `TEST_DATA` from the paths.
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/platform-android.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-ios.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-linux.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-osx.gypi | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi index 22558a237a..189fe933ee 100644 --- a/gyp/platform-android.gypi +++ b/gyp/platform-android.gypi @@ -11,7 +11,6 @@ 'sources': [ '../platform/android/src/log_android.cpp', - '../platform/android/src/asset_root.cpp', '../platform/default/async_task.cpp', '../platform/default/run_loop.cpp', '../platform/default/thread.cpp', diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 1a36cf046d..0c24663749 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -21,7 +21,6 @@ '../platform/darwin/log_nslog.mm', '../platform/darwin/string_nsstring.mm', '../platform/darwin/application_root.mm', - '../platform/darwin/asset_root.mm', '../platform/darwin/image.mm', '../platform/darwin/nsthread.mm', '../platform/darwin/reachability.m', diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi index 00595aa720..22dc452f33 100644 --- a/gyp/platform-linux.gypi +++ b/gyp/platform-linux.gypi @@ -15,7 +15,6 @@ '../platform/default/string_stdlib.cpp', '../platform/default/run_loop.cpp', '../platform/default/application_root.cpp', - '../platform/default/asset_root.cpp', '../platform/default/thread.cpp', '../platform/default/image.cpp', '../platform/default/png_reader.cpp', diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index ed4abea68f..0c2d824ad6 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -21,7 +21,6 @@ '../platform/darwin/log_nslog.mm', '../platform/darwin/string_nsstring.mm', '../platform/darwin/application_root.mm', - '../platform/darwin/asset_root.mm', '../platform/darwin/image.mm', '../platform/darwin/nsthread.mm', '../platform/darwin/reachability.m', |