Got ndk builds working

Author: inclement

bootstrap_templates/pygame/jni/Application.mk

@@ -8,5 +8,8 @@ APP_PROJECT_PATH := $(call my-dir)/..
 APP_MODULES := application sdl sdl_main tremor png jpeg freetype sdl_ttf sdl_image sqlite3
 
 APP_ABI := $(ARCH)
+# AND: I have no idea why I have to specify app_platform when distribute.sh seems to just set the sysroot cflag
+# AND: Either way, this has to *at least* be configurable
+APP_PLATFORM := android-14
 APP_STL := gnustl_static
 APP_CFLAGS += $(OFLAG)

bootstrap_templates/pygame/jni/application/Android.mk

@@ -18,7 +18,8 @@ LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
 				-I$(LOCAL_PATH)/../jpeg \
 				-I$(LOCAL_PATH)/../intl \
 				-I$(LOCAL_PATH)/.. \
-				-I$(LOCAL_PATH)/../../../build/python-install/include/python2.7
+				-I$(LOCAL_PATH)/../../../../python-install/include/python2.7
+				# -I$(LOCAL_PATH)/../../../build/python-install/include/python2.7
 
 
 LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)
@@ -36,7 +37,8 @@ LOCAL_STATIC_LIBRARIES := jpeg png
 
 LOCAL_LDLIBS := -lpython2.7 -lGLESv1_CM -ldl -llog -lz
 
-LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../build/python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
+# AND: Another hardcoded path that should be templated
+LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../../python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
 
 LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \
 	for f in $(LOCAL_PATH)/../../libs/$ARCH/*.so ; do \

recipes/kivy/__init__.py

@@ -1,8 +1,8 @@
 
-from toolchain import PythonRecipe, shprint
+from toolchain import CythonRecipe, shprint
 
 
-class KivyRecipe(PythonRecipe):
+class KivyRecipe(CythonRecipe):
     version = 'stable'
     url = 'https://github.com/kivy/kivy/archive/{version}.zip'
     name = 'kivy'

recipes/pyjnius/__init__.py

@@ -1,8 +1,8 @@
 
-from toolchain import PythonRecipe, shprint
+from toolchain import CythonRecipe, shprint
 
 
-class PyjniusRecipe(PythonRecipe):
+class PyjniusRecipe(CythonRecipe):
     version  = 'master'
     url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
     name = 'pyjnius'

recipes/sdl/__init__.py

@@ -1,8 +1,7 @@
-from toolchain import NDKRecipe, shprint
+from toolchain import NDKRecipe, shprint, ArchAndroid, current_directory
+from os.path import exists, join
 import sh
 
-
-
 class LibSDLRecipe(NDKRecipe):
     version = "1.2.14"
     url = None  
@@ -12,18 +11,27 @@ class LibSDLRecipe(NDKRecipe):
     def prebuild_armeabi(self):
         print('Debug: sdl recipe dir is ' + self.get_build_dir())
 
-    def build_arch(self, arch):
-        # shprint(sh.xcodebuild,
-        #         "ONLY_ACTIVE_ARCH=NO",
-        #         "ARCHS={}".format(arch.arch),
-        #         "-sdk", arch.sdk,
-        #         "-project", "Xcode-iOS/SDL/SDL.xcodeproj",
-        #         "-tarelf.et", "libSDL",
-        #         "-configuration", "Release")
-        env = self.get_recipe_env(arch)
-        shprint(sh.ndk_build,
-                "V=1", "sdl2",
-                _env=env)
+    def build_armeabi(self):
+
+        if exists(join(self.ctx.libs_dir, 'libsdl.so')):
+            print('libsdl.so already exists, skipping sdl build.')
+            return
+        
+        env = ArchAndroid(self.ctx).get_env()
+
+        print('env is', env)
+
+        with current_directory(self.get_jni_dir()):
+            shprint(sh.ndk_build, 'V=1', _env=env)
+
+        libs_dir = join(self.ctx.bootstrap.build_dir, 'libs', 'armeabi')
+        import os
+        print('libs dir is', libs_dir)
+        contents = list(os.walk(libs_dir))[0][-1]
+        print('contents are', contents)
+        for content in contents:
+            shprint(sh.cp, '-a', join(self.ctx.bootstrap.build_dir, 'libs', 'armeabi', content),
+                    self.ctx.libs_dir)
 
 
 recipe = LibSDLRecipe()

toolchain.py

@@ -11,7 +11,7 @@
 import sys
 from sys import stdout
 from os.path import join, dirname, realpath, exists, isdir, basename
-from os import listdir, unlink, makedirs, environ, chdir, getcwd, walk
+from os import listdir, unlink, makedirs, environ, chdir, getcwd, walk, uname
 import zipfile
 import tarfile
 import importlib
@@ -251,6 +251,15 @@ def get_env(self):
         env['MAKE'] = 'make -j5'
         env['READELF'] = '{}-readelf'.format(toolchain_prefix)
 
+        hostpython_recipe = Recipe.get_recipe('hostpython2', self.ctx)
+        
+        # AND: This hardcodes python version 2.7, needs fixing
+        # AND: This also hardcodes armeabi, which isn't even correct, don't forget to fix!
+        env['BUILDLIB_PATH'] = join(hostpython_recipe.get_actual_build_dir('armeabi'),
+                                    'build', 'lib.linux-{}-2.7'.format(uname()[-1]))
+
+        env['ARCH'] = self.arch
+
         return env
 
 
@@ -459,9 +468,9 @@ def __init__(self):
         ensure_dir(join(self.build_dir, 'other_builds'))  # where everything else is built
 
         # # remove the most obvious flags that can break the compilation
+        self.env.pop("LDFLAGS", None)
         self.env.pop("ARCHFLAGS", None)
         self.env.pop("CFLAGS", None)
-        self.env.pop("LDFLAGS", None)
 
         # set the state
         self.state = JsonStore(join(self.dist_dir, "state.db"))
@@ -502,6 +511,7 @@ class Bootstrap(object):
     # blacklist.txt
     #  
 
+
     @property
     def jni_dir(self):
         return self.bootstrap_template_dir + self.jni_subdir
@@ -984,6 +994,9 @@ def prebuild(self):
     def build(self):
         self.build_arch(self.ctx.archs[0])  # Same here!
 
+    def postbuild(self):
+        self.postbuild_arch(self.ctx.archs[0])
+
     def prebuild_arch(self, arch):
         prebuild = "prebuild_{}".format(arch.arch)
         if hasattr(self, prebuild):
@@ -1121,6 +1134,9 @@ class NDKRecipe(Recipe):
     def get_build_dir(self):
         return join(self.ctx.bootstrap.build_dir, 'jni', self.name)
 
+    def get_jni_dir(self):
+        return join(self.ctx.bootstrap.build_dir, 'jni')
+
     def prepare_build_dir(self, ctx):
         self.ctx = ctx
         print('{} is an NDK recipe, it is alread included in the '
@@ -1276,13 +1292,22 @@ def build_recipes(names, ctx):
     for recipe in recipes:
         recipe.build()
 
+    # 4) biglink everything
+    biglink(ctx)
+
+    # 5) postbuild packages
+    for recipe in recipes:
+        recipe.postbuild()
 
     return
     for recipe in recipes:
         recipe.init_with_ctx(ctx)
     for recipe in recipes:
         recipe.execute()
 
+def biglink(ctx):
+    print('skipping biglink...there is no libpymodules.so?')
+
 
 def ensure_dir(filename):
     if not exists(filename):