Added patch to pass ndk platform includes to sdl2_image

inclement · inclement · commit 223225fdb3b1 · 2017-08-29T19:03:08.000+01:00
diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py
@@ -63,6 +63,9 @@ def get_env(self, with_flags_in_cc=True):
         if self.ctx.ndk == 'crystax':
             env['LDFLAGS'] += ' -L{}/sources/crystax/libs/{} -lcrystax'.format(self.ctx.ndk_dir, self.arch)
 
+        # Pass the ndk platform include dir to Android.mk files if necessary
+        env['NDK_PLATFORM_INCLUDE_DIR'] = join(self.ctx.ndk_platform, 'usr', 'include')
+
         py_platform = sys.platform
         if py_platform in ['linux2', 'linux3']:
             py_platform = 'linux'
diff --git a/pythonforandroid/recipes/sdl2_image/__init__.py b/pythonforandroid/recipes/sdl2_image/__init__.py
@@ -9,6 +9,7 @@ class LibSDL2Image(BootstrapNDKRecipe):
 
     patches = ['toggle_jpg_png_webp.patch',
                ('disable_jpg.patch', is_arch('x86')),
-               'extra_cflags.patch']
+               'extra_cflags.patch',
+               'add_ndk_platform_include_dir.patch']
 
 recipe = LibSDL2Image()
diff --git a/pythonforandroid/recipes/sdl2_image/add_ndk_platform_include_dir.patch b/pythonforandroid/recipes/sdl2_image/add_ndk_platform_include_dir.patch
@@ -0,0 +1,13 @@
+diff --git a/Android.mk b/Android.mk
+index d48111b..3108b2c 100644
+--- a/Android.mk
++++ b/Android.mk
+@@ -22,7 +22,7 @@ SUPPORT_WEBP := false
+ WEBP_LIBRARY_PATH := external/libwebp-0.3.0
+ 
+ 
+-LOCAL_C_INCLUDES := $(LOCAL_PATH)
++LOCAL_C_INCLUDES := $(LOCAL_PATH) $(NDK_PLATFORM_INCLUDE_DIR)
+ LOCAL_CFLAGS := -DLOAD_BMP -DLOAD_GIF -DLOAD_LBM -DLOAD_PCX -DLOAD_PNM \
+                 -DLOAD_TGA -DLOAD_XCF -DLOAD_XPM -DLOAD_XV
+ LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays $(EXTRA_CFLAGS)
