From 197f0ca6b418a27412bfcc7e891ab80949fd8833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 11 Apr 2017 17:18:09 +0200 Subject: [android] use AAssetManager instead of libzip --- test/map/map.test.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'test/map') diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index f563aaa548..2f3883fb1f 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -356,12 +356,7 @@ TEST(Map, WithoutVAOExtension) { test.backend.getContext().disableVAOExtension = true; -#ifdef MBGL_ASSET_ZIP - // Regenerate with `cd test/fixtures/api/ && zip -r assets.zip assets/` - DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets.zip"); -#else DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); -#endif Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still); map.setStyleJSON(util::read_file("test/fixtures/api/water.json")); @@ -589,14 +584,7 @@ TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) { BackendScope scope { backend }; OffscreenView view { backend.getContext() }; ThreadPool threadPool { 4 }; - -#ifdef MBGL_ASSET_ZIP - // Regenerate with `cd test/fixtures/api/ && zip -r assets.zip assets/` - DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets.zip"); -#else DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); -#endif - Map map(backend, view.getSize(), 1, fileSource, threadPool, MapMode::Continuous); using namespace std::chrono_literals; -- cgit v1.2.1