diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index a1094f1218..bc31f07377 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -7,8 +7,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := retroarch
 LOCAL_SRC_FILES    = ../../console/griffin/griffin.c ../../console/rzlib/rzlib.c
 
-LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99
+LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99
 
-LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -lGLESv2 -llog
+LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -lGLESv1_CM -llog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/gfx/gl.c b/gfx/gl.c
index 7ea6c3bd5f..539d16d081 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -370,6 +370,12 @@ static void gl_create_fbo_textures(gl_t *gl)
 
 #if defined(HAVE_OPENGLES) && !defined(HAVE_OPENGLES1)
       // Doesn't support GL_CLAMP_TO_BORDER. NOTE: This will be a serious problem for some shaders.
+      //
+      // NOTE2: We still need to query if GL_CLAMP_TO_BORDER is supported even if compiling with
+      // OpenGL ES 1 because none of these defines are in any system headers except for what every
+      // Android GPU supports (which doesn't include GL_CLAMP_TO_BORDER) - move the underlying value 
+      // for GL_CLAMP_TO_BORDER to some variable that we'll use here and query at gl_init if 
+      // GL_CLAMP_TO_BORDER is available
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 #else