From 2aaa328cc5dca96d70dce025759809c5470da97c Mon Sep 17 00:00:00 2001
From: zmiao <miao.zhao@mapbox.com>
Date: Tue, 15 Oct 2019 12:17:49 +0300
Subject: [test-runner] fix build error

---
 next/platform/android/android.cmake              | 9 ++-------
 platform/android/src/test/render_test_runner.cpp | 2 ++
 render-test/parser.cpp                           | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake
index d7c5ae5bd6..7d7fd3bb21 100644
--- a/next/platform/android/android.cmake
+++ b/next/platform/android/android.cmake
@@ -297,13 +297,7 @@ target_link_libraries(
 
 add_library(
     mbgl-render-test-runner SHARED
-    ${MBGL_ROOT}/platform/android/src/test/render_test_runner.cpp ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c
-)
-
-target_include_directories(
-    mbgl-render-test-runner
-    ${MBGL_ROOT}/platform/android/src/test/render_test_runner.cpp
-    ${MBGL_ROOT}/platform/android/src/test/runtime.cpp
+    ${MBGL_ROOT}/platform/android/src/test/render_test_runner.cpp ${MBGL_ROOT}/platform/android/src/test/runtime.cpp
     ${MBGL_ROOT}/platform/android/src/test/runtime.hpp
 )
 
@@ -311,6 +305,7 @@ target_link_libraries(
     mbgl-render-test-runner
     PRIVATE
         Mapbox::Base::jni.hpp
+        mapbox-gl
         mbgl-render-test
         android
         log
diff --git a/platform/android/src/test/render_test_runner.cpp b/platform/android/src/test/render_test_runner.cpp
index aa330a2322..0d08d130eb 100644
--- a/platform/android/src/test/render_test_runner.cpp
+++ b/platform/android/src/test/render_test_runner.cpp
@@ -1,6 +1,8 @@
 #include <mbgl/render_test.hpp>
 #include "runtime.hpp"
 
+#include <string>
+
 int main(int argc, char *argv[]) {
     if (!mbgl::android::initRuntime(argc, argv)) {
         return 1;
diff --git a/render-test/parser.cpp b/render-test/parser.cpp
index b39098cf4b..782ee3ce24 100644
--- a/render-test/parser.cpp
+++ b/render-test/parser.cpp
@@ -446,7 +446,7 @@ std::vector<std::pair<std::string, std::string>> parseIgnores(const std::string&
 
     mbgl::filesystem::path platformSpecificIgnores;
     mbgl::filesystem::path ownTestsIgnores =
-        mbgl::filesystem::path(TEST_RUNNER_ROOT_PATH).append("render-test/tests/should-fail.json");
+        mbgl::filesystem::path(testRootPath).append("render-test/tests/should-fail.json");
 
 #ifdef __APPLE__
     platformSpecificIgnores = mbgl::filesystem::path(testRootPath).append("render-test/mac-ignores.json");
-- 
cgit v1.2.1