From 72194543550c7d1dd6a2986bc6fc3492abbee1b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= <spartanj@gmail.com>
Date: Mon, 4 Nov 2019 17:56:19 -0300
Subject: [PATCH] Fix android build.

--HG--
branch : dev
---
 projects/android-project/app/jni/Application.mk |  2 +-
 projects/android-project/app/jni/eepp.mk        |  8 ++++----
 src/eepp/ui/uiloader.cpp                        | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/projects/android-project/app/jni/Application.mk b/projects/android-project/app/jni/Application.mk
index 158146c26..d124b6239 100644
--- a/projects/android-project/app/jni/Application.mk
+++ b/projects/android-project/app/jni/Application.mk
@@ -20,4 +20,4 @@ APP_CPPFLAGS			:= -std=c++14 -frtti -fexceptions
 
 APP_PLATFORM			:= android-14
 APP_MODULES				:= main
-APP_ABI					:= armeabi-v7a x86
+APP_ABI					:= armeabi-v7a x86 x86_64
diff --git a/projects/android-project/app/jni/eepp.mk b/projects/android-project/app/jni/eepp.mk
index 6357175b6..aae303c51 100644
--- a/projects/android-project/app/jni/eepp.mk
+++ b/projects/android-project/app/jni/eepp.mk
@@ -38,7 +38,7 @@ EEPP_C_FLAGS				:= \
 
 EEPP_LDLIBS				:= $(APP_LDLIBS)
 
-include $(call all-subdir-makefiles) 
+include $(call all-subdir-makefiles)
 
 #*************** EEPP ***************
 include $(CLEAR_VARS)
@@ -62,6 +62,7 @@ CODE_SRCS				:=  \
 	system/*.cpp \
 	system/platform/posix/*.cpp \
 	network/*.cpp \
+	network/http/*.cpp \
 	network/ssl/*.cpp \
 	network/ssl/backend/mbedtls/*.cpp \
 	network/platform/unix/*.cpp \
@@ -70,7 +71,6 @@ CODE_SRCS				:=  \
 	audio/*.cpp \
 	window/*.cpp \
 	window/backend/SDL2/*.cpp \
-	window/platform/null/*.cpp \
 	graphics/*.cpp \
 	graphics/renderer/*.cpp \
 	physics/*.cpp \
@@ -90,7 +90,7 @@ LOCAL_SRC_FILES			:= $(foreach F, $(CODE_SRCS), $(addprefix $(dir $(F)),$(notdir
 
 LOCAL_STATIC_LIBRARIES	:= openal SDL2 chipmunk freetype
 
-include $(BUILD_STATIC_LIBRARY) 
+include $(BUILD_STATIC_LIBRARY)
 #*************** EEPP ***************
 
 #*************** CHIPMUNK ***************
@@ -226,4 +226,4 @@ LOCAL_SRC_FILES := \
 
 include $(BUILD_STATIC_LIBRARY)
 #**************** SDL 2 ***************
- 
+
diff --git a/src/eepp/ui/uiloader.cpp b/src/eepp/ui/uiloader.cpp
index 1ce9d0b40..192b22611 100644
--- a/src/eepp/ui/uiloader.cpp
+++ b/src/eepp/ui/uiloader.cpp
@@ -48,14 +48,19 @@ void UILoader::draw() {
 	mCircle.setPosition( rect.getCenter() );
 
 	ClippingMask * clippingMask = Renderer::instance()->getClippingMask();
-	clippingMask->setMaskMode( ClippingMask::Exclusive );
-	clippingMask->clearMasks();
-	clippingMask->appendMask( mCircle );
-	clippingMask->stencilMaskEnable();
+
+	if ( mCircle.getRadius() > 0 ) {
+		clippingMask->setMaskMode( ClippingMask::Exclusive );
+		clippingMask->clearMasks();
+		clippingMask->appendMask( mCircle );
+		clippingMask->stencilMaskEnable();
+	}
 
 	mArc.draw();
 
-	clippingMask->stencilMaskDisable();
+	if ( mCircle.getRadius() > 0 ) {
+		clippingMask->stencilMaskDisable();
+	}
 }
 
 void UILoader::scheduledUpdate( const Time& time ) {