[android] Do not use libuv

Build using Looper instead, provided by the NDK.
mapbox · Apr 6, 2016 · 4b05705 · 4b05705
1 parent 10b503e
commit 4b05705
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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
@@ -2,7 +2,7 @@ HEADLESS ?= none
 PLATFORM ?= android
 ASSET ?= zip
 HTTP ?= android
-LOOP ?= uv
+LOOP ?= android
 
 GYP_FLAVOR_SUFFIX=-android