[android] a fresh attempt at android support using libc++/clang - refs …

…mapbox#71 mapbox#94 mapbox#98
ljbade · Oct 18, 2014 · df743f8 · df743f8
1 parent d54809b
commit df743f8
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,7 +32,7 @@ install:
 - ./scripts/travis_install.sh
 
 before_script:
-- rm -rf mapnik-packaging/out/packages
+- true
 
 script:
 - ./scripts/travis_script.sh

diff --git a/Makefile b/Makefile
@@ -42,6 +42,10 @@ xtest: config.gypi clear_xcode_cache node
 
 ##### Makefile builds ##########################################################
 
+android: llmr.gyp node
+	export PLATFORM=Android && ./setup-libraries.sh
+	deps/run_gyp llmr.gyp --depth=. -Goutput_dir=.. --generator-output=./build/android -f make-android
+	$(MAKE) -C ./build/android BUILDTYPE=$(BUILDTYPE) V=$(V) llmr-x86
 
 # Builds the linux app with make.
 linux: config.gypi linux/mapboxgl-app.gyp node

diff --git a/include/mbgl/platform/gl.hpp b/include/mbgl/platform/gl.hpp
@@ -35,6 +35,9 @@
     #else
         #error Unsupported Apple platform
     #endif
+#elif __ANDROID__
+    #include <GLES2/gl2.h>
+    #include <GLES2/gl2ext.h>
 #else
     #define GL_GLEXT_PROTOTYPES
     #include <GL/gl.h>

diff --git a/setup-libraries.sh b/setup-libraries.sh
@@ -65,7 +65,21 @@ cd ./osx/
 
 export CXX11=true
 
-if [ ${UNAME} = 'Darwin' ]; then
+if [ ${PLATFORM} = 'Android' ]; then
+source Android.sh
+    #if [ ! -f out/build-cpp11-libstdcpp-gcc-arm/bin/pkg_config ] ; then ./scripts/build_pkg_config.sh ; fi
+    if [ ! -f out/build-cpp11-libstdcpp-gcc-arm/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
+    if [ ! -f out/build-cpp11-libstdcpp-gcc-arm/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi
+    if [ ! -d out/build-cpp11-libstdcpp-gcc-arm/include/boost ] ; then ./scripts/build_boost.sh `pwd`/../../src/ `pwd`/../../include/ `pwd`/../$
+    echo '     ...done'
+
+cd ../../
+./configure \
+--pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-arm/lib/pkgconfig \
+--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-arm
+
+
+elif [ ${UNAME} = 'Darwin' ]; then
 
 if [[ -n ${TRAVIS:-} ]]; then
     if aws s3 cp s3://mapbox-gl-testing/dependencies/build-cpp11-libcpp-osx_${MP_HASH}_${DIR_HASH}.tar.gz ./out/ ; then

diff --git a/src/renderer/painter_prerender.cpp b/src/renderer/painter_prerender.cpp
@@ -10,7 +10,7 @@ void Painter::preparePrerender(RasterBucket &bucket) {
     glDisable(GL_STENCIL_TEST);
 
 // Render the actual tile.
-#if GL_EXT_discard_framebuffer
+#if GL_EXT_discard_framebuffer && !__ANDROID__
     const GLenum discards[] = {GL_COLOR_ATTACHMENT0};
     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards);
 #endif

diff --git a/src/renderer/prerendered_texture.cpp b/src/renderer/prerendered_texture.cpp
@@ -117,7 +117,7 @@ void PrerenderedTexture::blur(Painter& painter, uint16_t passes) {
     for (int i = 0; i < passes; i++) {
         // Render horizontal
         glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, secondary_texture, 0);
-#if GL_EXT_discard_framebuffer
+#if GL_EXT_discard_framebuffer && !__ANDROID__
         const GLenum discards[] = { GL_COLOR_ATTACHMENT0 };
         glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards);
 #endif
@@ -132,7 +132,7 @@ void PrerenderedTexture::blur(Painter& painter, uint16_t passes) {
 
         // Render vertical
         glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, original_texture, 0);
-#if GL_EXT_discard_framebuffer
+#if GL_EXT_discard_framebuffer && !__ANDROID__
         glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards);
 #endif
         glClear(GL_COLOR_BUFFER_BIT);