[build] rework platform/default directory and add -files.txt for vendored libsupstream/build-changes

53 files changed, 12 insertions, 15 deletions

diff --git a/platform/default/jni/string_conversion.hpp b/platform/default/include/jni/string_conversion.hpp
index 66df539f4e..66df539f4e 100644
--- a/platform/default/jni/string_conversion.hpp
+++ b/platform/default/include/jni/string_conversion.hpp
diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/include/mbgl/gl/headless_backend.hpp
index 7757037533..7757037533 100644
--- a/platform/default/mbgl/gl/headless_backend.hpp
+++ b/platform/default/include/mbgl/gl/headless_backend.hpp
diff --git a/platform/default/mbgl/gl/headless_frontend.hpp b/platform/default/include/mbgl/gl/headless_frontend.hpp
index 18f0cfa537..18f0cfa537 100644
--- a/platform/default/mbgl/gl/headless_frontend.hpp
+++ b/platform/default/include/mbgl/gl/headless_frontend.hpp
diff --git a/platform/default/mbgl/map/map_snapshotter.hpp b/platform/default/include/mbgl/map/map_snapshotter.hpp
index 2deb2b3cda..2deb2b3cda 100644
--- a/platform/default/mbgl/map/map_snapshotter.hpp
+++ b/platform/default/include/mbgl/map/map_snapshotter.hpp
diff --git a/platform/default/mbgl/storage/file_source_request.hpp b/platform/default/include/mbgl/storage/file_source_request.hpp
index 6bd0d44df6..6bd0d44df6 100644
--- a/platform/default/mbgl/storage/file_source_request.hpp
+++ b/platform/default/include/mbgl/storage/file_source_request.hpp
diff --git a/platform/default/mbgl/storage/merge_sideloaded.hpp b/platform/default/include/mbgl/storage/merge_sideloaded.hpp
index 494018c966..494018c966 100644
--- a/platform/default/mbgl/storage/merge_sideloaded.hpp
+++ b/platform/default/include/mbgl/storage/merge_sideloaded.hpp
diff --git a/platform/default/mbgl/storage/merge_sideloaded.js b/platform/default/include/mbgl/storage/merge_sideloaded.js
index 98d52eb8b3..98d52eb8b3 100644
--- a/platform/default/mbgl/storage/merge_sideloaded.js
+++ b/platform/default/include/mbgl/storage/merge_sideloaded.js
diff --git a/platform/default/mbgl/storage/merge_sideloaded.sql b/platform/default/include/mbgl/storage/merge_sideloaded.sql
index 55345a6f15..55345a6f15 100644
--- a/platform/default/mbgl/storage/merge_sideloaded.sql
+++ b/platform/default/include/mbgl/storage/merge_sideloaded.sql
diff --git a/platform/default/mbgl/storage/offline_database.hpp b/platform/default/include/mbgl/storage/offline_database.hpp
index 993f36a606..993f36a606 100644
--- a/platform/default/mbgl/storage/offline_database.hpp
+++ b/platform/default/include/mbgl/storage/offline_database.hpp
diff --git a/platform/default/mbgl/storage/offline_download.hpp b/platform/default/include/mbgl/storage/offline_download.hpp
index 1e77ff1d35..1e77ff1d35 100644
--- a/platform/default/mbgl/storage/offline_download.hpp
+++ b/platform/default/include/mbgl/storage/offline_download.hpp
diff --git a/platform/default/mbgl/storage/offline_schema.hpp b/platform/default/include/mbgl/storage/offline_schema.hpp
index e177d0dbd3..e177d0dbd3 100644
--- a/platform/default/mbgl/storage/offline_schema.hpp
+++ b/platform/default/include/mbgl/storage/offline_schema.hpp
diff --git a/platform/default/mbgl/storage/offline_schema.js b/platform/default/include/mbgl/storage/offline_schema.js
index fdb7dc6405..fdb7dc6405 100644
--- a/platform/default/mbgl/storage/offline_schema.js
+++ b/platform/default/include/mbgl/storage/offline_schema.js
diff --git a/platform/default/mbgl/storage/offline_schema.sql b/platform/default/include/mbgl/storage/offline_schema.sql
index 722b0e0451..722b0e0451 100644
--- a/platform/default/mbgl/storage/offline_schema.sql
+++ b/platform/default/include/mbgl/storage/offline_schema.sql
diff --git a/platform/default/sqlite3.hpp b/platform/default/include/mbgl/storage/sqlite3.hpp
index 33f735d904..44dc746075 100644
--- a/platform/default/sqlite3.hpp
+++ b/platform/default/include/mbgl/storage/sqlite3.hpp
@@ -72,10 +72,10 @@ void setTempPath(const std::string&);
 class Database {
 private:
     Database(std::unique_ptr<DatabaseImpl>);
-    Database(const Database &) = delete;
-    Database &operator=(const Database &) = delete;
 
 public:
+    Database(const Database &) = delete;
+    Database &operator=(const Database &) = delete;
     static mapbox::util::variant<Database, Exception> tryOpen(const std::string &filename, int flags = 0);
     static Database open(const std::string &filename, int flags = 0);
 
@@ -154,12 +154,11 @@ private:
 };
 
 class Transaction {
-private:
+public:
     Transaction(const Transaction&) = delete;
     Transaction(Transaction&&) = delete;
     Transaction& operator=(const Transaction&) = delete;
 
-public:
     enum Mode {
         Deferred,
         Immediate,
@@ -177,5 +176,5 @@ private:
     bool needRollback = true;
 };
 
-}
-}
+} // namespace sqlite
+} // namespace mapbox
diff --git a/platform/default/unaccent.hpp b/platform/default/include/mbgl/text/unaccent.hpp
index 85ac37a7de..85ac37a7de 100644
--- a/platform/default/unaccent.hpp
+++ b/platform/default/include/mbgl/text/unaccent.hpp
diff --git a/platform/default/mbgl/util/default_styles.hpp b/platform/default/include/mbgl/util/default_styles.hpp
index 13f08252a7..13f08252a7 100644
--- a/platform/default/mbgl/util/default_styles.hpp
+++ b/platform/default/include/mbgl/util/default_styles.hpp
diff --git a/platform/default/mbgl/util/default_thread_pool.hpp b/platform/default/include/mbgl/util/default_thread_pool.hpp
index a14d16d771..a14d16d771 100644
--- a/platform/default/mbgl/util/default_thread_pool.hpp
+++ b/platform/default/include/mbgl/util/default_thread_pool.hpp
diff --git a/platform/default/mbgl/util/shared_thread_pool.hpp b/platform/default/include/mbgl/util/shared_thread_pool.hpp
index 04a3cb58d5..04a3cb58d5 100644
--- a/platform/default/mbgl/util/shared_thread_pool.hpp
+++ b/platform/default/include/mbgl/util/shared_thread_pool.hpp
diff --git a/platform/default/mbgl/storage/.clang-tidy b/platform/default/mbgl/storage/.clang-tidy
deleted file mode 100644
index b4ecd26b95..0000000000
--- a/platform/default/mbgl/storage/.clang-tidy
+++ /dev/null
@@ -1,2 +0,0 @@
-Checks: 'modernize-*,misc-static-assert,llvm-namespace-comment,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-core.uninitialized.UndefReturn,-clang-analyzer-core.StackAddressEscape,-clang-analyzer-core.CallAndMessage,-clang-diagnostic-unused-command-line-argument,-clang-analyzer-core.uninitialized.*,-clang-analyzer-core.NullDereference,-clang-analyzer-cplusplus.NewDelete,-clang-analyzer-unix.MismatchedDeallocator,-clang-analyzer-unix.cstring.NullArg,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-unix.Malloc,-clang-analyzer-core.NonNullParamChecker'
-HeaderFilterRegex: '\/mbgl\/'
diff --git a/platform/default/mbgl/gl/headless_backend.cpp b/platform/default/src/mbgl/gl/headless_backend.cpp
index ba08aecab7..ba08aecab7 100644
--- a/platform/default/mbgl/gl/headless_backend.cpp
+++ b/platform/default/src/mbgl/gl/headless_backend.cpp
diff --git a/platform/default/headless_backend_osmesa.cpp b/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp
index 0da1caf9af..0da1caf9af 100644
--- a/platform/default/headless_backend_osmesa.cpp
+++ b/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp
diff --git a/platform/default/mbgl/gl/headless_frontend.cpp b/platform/default/src/mbgl/gl/headless_frontend.cpp
index 37b0f91f32..37b0f91f32 100644
--- a/platform/default/mbgl/gl/headless_frontend.cpp
+++ b/platform/default/src/mbgl/gl/headless_frontend.cpp
diff --git a/platform/default/layer_manager.cpp b/platform/default/src/mbgl/layermanager/layer_manager.cpp
index 05d0f4d1ae..05d0f4d1ae 100644
--- a/platform/default/layer_manager.cpp
+++ b/platform/default/src/mbgl/layermanager/layer_manager.cpp
diff --git a/platform/default/mbgl/map/map_snapshotter.cpp b/platform/default/src/mbgl/map/map_snapshotter.cpp
index ae14b20721..ae14b20721 100644
--- a/platform/default/mbgl/map/map_snapshotter.cpp
+++ b/platform/default/src/mbgl/map/map_snapshotter.cpp
diff --git a/platform/default/asset_file_source.cpp b/platform/default/src/mbgl/storage/asset_file_source.cpp
index 7988654ae5..7988654ae5 100644
--- a/platform/default/asset_file_source.cpp
+++ b/platform/default/src/mbgl/storage/asset_file_source.cpp
diff --git a/platform/default/default_file_source.cpp b/platform/default/src/mbgl/storage/default_file_source.cpp
index cad68e7de9..cad68e7de9 100644
--- a/platform/default/default_file_source.cpp
+++ b/platform/default/src/mbgl/storage/default_file_source.cpp
diff --git a/platform/default/file_source_request.cpp b/platform/default/src/mbgl/storage/file_source_request.cpp
index 09ea8cc32a..09ea8cc32a 100644
--- a/platform/default/file_source_request.cpp
+++ b/platform/default/src/mbgl/storage/file_source_request.cpp
diff --git a/platform/default/http_file_source.cpp b/platform/default/src/mbgl/storage/http_file_source.cpp
index 213b53de98..213b53de98 100644
--- a/platform/default/http_file_source.cpp
+++ b/platform/default/src/mbgl/storage/http_file_source.cpp
diff --git a/platform/default/local_file_source.cpp b/platform/default/src/mbgl/storage/local_file_source.cpp
index 1b7b7b9278..1b7b7b9278 100644
--- a/platform/default/local_file_source.cpp
+++ b/platform/default/src/mbgl/storage/local_file_source.cpp
diff --git a/platform/default/mbgl/storage/offline.cpp b/platform/default/src/mbgl/storage/offline.cpp
index e1ec0acb31..e1ec0acb31 100644
--- a/platform/default/mbgl/storage/offline.cpp
+++ b/platform/default/src/mbgl/storage/offline.cpp
diff --git a/platform/default/mbgl/storage/offline_database.cpp b/platform/default/src/mbgl/storage/offline_database.cpp
index 28c1359106..7732076991 100644
--- a/platform/default/mbgl/storage/offline_database.cpp
+++ b/platform/default/src/mbgl/storage/offline_database.cpp
@@ -1,15 +1,15 @@
 #include <mbgl/storage/offline_database.hpp>
 #include <mbgl/storage/response.hpp>
+#include <mbgl/storage/sqlite3.hpp>
 #include <mbgl/util/compression.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/util/logging.hpp>
 
-#include "offline_schema.hpp"
-#include "merge_sideloaded.hpp"
+#include <mbgl/storage/offline_schema.hpp>
+#include <mbgl/storage/merge_sideloaded.hpp>
 
-#include "sqlite3.hpp"
 
 namespace mbgl {
 
diff --git a/platform/default/mbgl/storage/offline_download.cpp b/platform/default/src/mbgl/storage/offline_download.cpp
index c97797a5a2..c97797a5a2 100644
--- a/platform/default/mbgl/storage/offline_download.cpp
+++ b/platform/default/src/mbgl/storage/offline_download.cpp
diff --git a/platform/default/online_file_source.cpp b/platform/default/src/mbgl/storage/online_file_source.cpp
index fce1c3e2b6..fce1c3e2b6 100644
--- a/platform/default/online_file_source.cpp
+++ b/platform/default/src/mbgl/storage/online_file_source.cpp
diff --git a/platform/default/sqlite3.cpp b/platform/default/src/mbgl/storage/sqlite3.cpp
index f8a7daefe6..0017dc45db 100644
--- a/platform/default/sqlite3.cpp
+++ b/platform/default/src/mbgl/storage/sqlite3.cpp
@@ -1,4 +1,4 @@
-#include "sqlite3.hpp"
+#include <mbgl/storage/sqlite3.hpp>
 #include <sqlite3.h>
 
 #include <algorithm>
diff --git a/platform/default/mbgl/test/main.cpp b/platform/default/src/mbgl/test/main.cpp
index d01cf75ffc..d01cf75ffc 100644
--- a/platform/default/mbgl/test/main.cpp
+++ b/platform/default/src/mbgl/test/main.cpp
diff --git a/platform/default/bidi.cpp b/platform/default/src/mbgl/text/bidi.cpp
index 32a3dc23ef..32a3dc23ef 100644
--- a/platform/default/bidi.cpp
+++ b/platform/default/src/mbgl/text/bidi.cpp
diff --git a/platform/default/collator.cpp b/platform/default/src/mbgl/text/collator.cpp
index b7f256756e..400fa4d94d 100644
--- a/platform/default/collator.cpp
+++ b/platform/default/src/mbgl/text/collator.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/style/expression/collator.hpp>
 #include <mbgl/util/platform.hpp>
 #include <libnu/strcoll.h>
-#include <unaccent.hpp>
+#include <mbgl/text/unaccent.hpp>
 
 /*
     The default implementation of Collator ignores locale.
diff --git a/platform/default/local_glyph_rasterizer.cpp b/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
index 7866f29420..7866f29420 100644
--- a/platform/default/local_glyph_rasterizer.cpp
+++ b/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
diff --git a/platform/default/unaccent.cpp b/platform/default/src/mbgl/text/unaccent.cpp
index faefb4b4cd..37b9a0d9ca 100644
--- a/platform/default/unaccent.cpp
+++ b/platform/default/src/mbgl/text/unaccent.cpp
@@ -1,6 +1,6 @@
 #include <mbgl/util/platform.hpp>
 #include <libnu/unaccent.h>
-#include <unaccent.hpp>
+#include <mbgl/text/unaccent.hpp>
 
 #include <cstring>
 #include <sstream>
diff --git a/platform/default/async_task.cpp b/platform/default/src/mbgl/util/async_task.cpp
index 50891056d8..50891056d8 100644
--- a/platform/default/async_task.cpp
+++ b/platform/default/src/mbgl/util/async_task.cpp
diff --git a/platform/default/mbgl/util/default_thread_pool.cpp b/platform/default/src/mbgl/util/default_thread_pool.cpp
index d3950bb8aa..d3950bb8aa 100644
--- a/platform/default/mbgl/util/default_thread_pool.cpp
+++ b/platform/default/src/mbgl/util/default_thread_pool.cpp
diff --git a/platform/default/image.cpp b/platform/default/src/mbgl/util/image.cpp
index 25063892b7..25063892b7 100644
--- a/platform/default/image.cpp
+++ b/platform/default/src/mbgl/util/image.cpp
diff --git a/platform/default/jpeg_reader.cpp b/platform/default/src/mbgl/util/jpeg_reader.cpp
index 5f613f9423..5f613f9423 100644
--- a/platform/default/jpeg_reader.cpp
+++ b/platform/default/src/mbgl/util/jpeg_reader.cpp
diff --git a/platform/default/logging_stderr.cpp b/platform/default/src/mbgl/util/logging_stderr.cpp
index 41585fb7bb..41585fb7bb 100644
--- a/platform/default/logging_stderr.cpp
+++ b/platform/default/src/mbgl/util/logging_stderr.cpp
diff --git a/platform/default/png_reader.cpp b/platform/default/src/mbgl/util/png_reader.cpp
index 4d4ee29d1f..4d4ee29d1f 100644
--- a/platform/default/png_reader.cpp
+++ b/platform/default/src/mbgl/util/png_reader.cpp
diff --git a/platform/default/png_writer.cpp b/platform/default/src/mbgl/util/png_writer.cpp
index b89e253f85..b89e253f85 100644
--- a/platform/default/png_writer.cpp
+++ b/platform/default/src/mbgl/util/png_writer.cpp
diff --git a/platform/default/run_loop.cpp b/platform/default/src/mbgl/util/run_loop.cpp
index 868ee72114..868ee72114 100644
--- a/platform/default/run_loop.cpp
+++ b/platform/default/src/mbgl/util/run_loop.cpp
diff --git a/platform/default/mbgl/util/shared_thread_pool.cpp b/platform/default/src/mbgl/util/shared_thread_pool.cpp
index 7a42df21de..d7facbab94 100644
--- a/platform/default/mbgl/util/shared_thread_pool.cpp
+++ b/platform/default/src/mbgl/util/shared_thread_pool.cpp
@@ -1,4 +1,4 @@
-#include "shared_thread_pool.hpp"
+#include <mbgl/util/shared_thread_pool.hpp>
 
 namespace mbgl {
 
diff --git a/platform/default/string_stdlib.cpp b/platform/default/src/mbgl/util/string_stdlib.cpp
index 103444df1c..103444df1c 100644
--- a/platform/default/string_stdlib.cpp
+++ b/platform/default/src/mbgl/util/string_stdlib.cpp
diff --git a/platform/default/thread.cpp b/platform/default/src/mbgl/util/thread.cpp
index c7c79b4fb0..c7c79b4fb0 100644
--- a/platform/default/thread.cpp
+++ b/platform/default/src/mbgl/util/thread.cpp
diff --git a/platform/default/thread_local.cpp b/platform/default/src/mbgl/util/thread_local.cpp
index db70773c12..db70773c12 100644
--- a/platform/default/thread_local.cpp
+++ b/platform/default/src/mbgl/util/thread_local.cpp
diff --git a/platform/default/timer.cpp b/platform/default/src/mbgl/util/timer.cpp
index 90a85bfc1f..90a85bfc1f 100644
--- a/platform/default/timer.cpp
+++ b/platform/default/src/mbgl/util/timer.cpp
diff --git a/platform/default/utf.cpp b/platform/default/src/mbgl/util/utf.cpp
index f0f9d3e67a..f0f9d3e67a 100644
--- a/platform/default/utf.cpp
+++ b/platform/default/src/mbgl/util/utf.cpp