From 4b05705194cde9b9434ff579063d067a869320f8 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Tue, 8 Mar 2016 13:39:50 -0300 Subject: [PATCH] [android] Do not use libuv Build using Looper instead, provided by the NDK. --- gyp/mbgl.gyp | 8 ++++++++ platform/android/scripts/configure.sh | 1 - platform/android/scripts/defaults.mk | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gyp/mbgl.gyp b/gyp/mbgl.gyp index 388e90c85..8c94bcb33 100644 --- a/gyp/mbgl.gyp +++ b/gyp/mbgl.gyp @@ -28,6 +28,14 @@ ], }], + ['loop_lib == "android"', { + 'sources': [ + '../platform/android/src/async_task.cpp', + '../platform/android/src/run_loop.cpp', + '../platform/android/src/timer.cpp', + ], + }], + ['loop_lib == "uv"', { 'sources': [ '../platform/default/async_task.cpp', diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh index 9c3353236..6e87a18dc 100644 --- a/platform/android/scripts/configure.sh +++ b/platform/android/scripts/configure.sh @@ -4,7 +4,6 @@ BOOST_VERSION=1.59.0 LIBPNG_VERSION=1.6.20 LIBJPEG_TURBO_VERSION=1.4.2 SQLITE_VERSION=3.9.1 -LIBUV_VERSION=1.7.5 ZLIB_VERSION=system NUNICODE_VERSION=1.6 LIBZIP_VERSION=0.11.2 diff --git a/platform/android/scripts/defaults.mk b/platform/android/scripts/defaults.mk index 78fdd6f38..f70c852ed 100644 --- a/platform/android/scripts/defaults.mk +++ b/platform/android/scripts/defaults.mk @@ -2,7 +2,7 @@ HEADLESS ?= none PLATFORM ?= android ASSET ?= zip HTTP ?= android -LOOP ?= uv +LOOP ?= android GYP_FLAVOR_SUFFIX=-android