Merge remote-tracking branch 'rsantina/wip_mobile' into wip_mobile

3 files changed, 174 insertions, 0 deletions

diff --git a/make/lib/gluegen-cpptasks-android-arm.xml b/make/lib/gluegen-cpptasks-android-arm.xml
new file mode 100644
index 0000000..d86f26c
--- /dev/null
+++ b/make/lib/gluegen-cpptasks-android-arm.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    This is an example of how to add custom compiler/linker 
+    arguments for a crosscompiler.
+
+    You can use such files with setting the property 'gluegen-cpptasks.file', ie:
+
+        -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml
+
+    In case you want to compile for 32bit on a 64bit machine,
+    you might also need to set the 'os.arch' to 'x86'.
+    Example: gluegen/make/make.gluegen.all.linux-x86.sh
+  -->
+
+<project name="GlueGen-cpptasks" basedir="." >
+
+<import file="../gluegen-cpptasks-base.xml" optional="false" />
+<property name="isAndroid"    value="true"/>
+
+<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android">
+    <echo message="Custom forced compiler Android NDK, linker.cfg.android" />
+    <!--<compiler id="compiler.cfg.android" name="arm-linux-androideabi-gcc"> -->
+    <compiler id="compiler.cfg.android" name="gcc">
+<!--      <compilerarg value="-v" /> -->
+      <compilerarg value="--sysroot=${env.TARGET_OS_PATH}" />  <!-- set root dir for lib and include -->
+      <compilerarg value="-B" /> <!--add additional directory for search  --> 
+      <compilerarg value="${env.TARGET_TOOL_PATH}/libexec/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}" /> 
+      <compilerarg value="-march=armv7-a" /> 
+      <compilerarg value="-fpic" /> 
+      <compilerarg value="-DANDROID" /> 
+      <compilerarg value="${env.NDK_INCLUDE}" /> 
+      <compilerarg value="-I${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/include" /> <!--inclides stdarg.h -->
+      <compilerarg value="-Wl,--demangle" /> 
+      <compilerarg value="-nostdlib" /> 
+      <compilerarg value="-Bdynamic" /> 
+      <compilerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> 
+      <compilerarg value="-Wl,--gc-sections" /> 
+      <compilerarg value="-Wl,-z,nocopyreloc" /> 
+      <compilerarg value="${env.TARGET_OS_PATH}/lib/libc.so" /> 
+      <compilerarg value="${env.TARGET_OS_PATH}/lib/libdl.so" /> 
+<!--      <compilerarg value="${env.TARGET_OS_PATH}/lib/libstdc++.so" /> -->
+      <compilerarg value="${env.TARGET_OS_PATH}/lib/libm.so" /> 
+<!--      <compilerarg value="${env.TARGET_OS_PATH}/lib/crtbegin_dynamic.o" /> -->
+      <compilerarg value="-Wl,--no-undefined" /> 
+      <compilerarg value="-Wl,-rpath-link=${env.TARGET_OS_PATH}/lib" /> 
+      <compilerarg value="${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/${env.TARGET_CPU_NAME}/libgcc.a" />
+      <compilerarg value="${env.TARGET_OS_PATH}/lib/crtend_android.o" /> 
+      <defineset>
+        <define name="ANDROID" />
+      </defineset>
+    </compiler>
+
+    <!--<linker id="linker.cfg.android" name="arm-linux-androideabi-gcc">-->
+    <linker id="linker.cfg.android" name="gcc">
+         <linkerarg value="-Wl,--demangle" /> 
+      	 <linkerarg value="--sysroot=${env.TARGET_OS_PATH}" />  <!-- set root dir for lib and include -->
+         <linkerarg value="-nostdlib" /> 
+         <linkerarg value="-Bdynamic" /> 
+         <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> 
+         <linkerarg value="-Wl,--gc-sections" /> 
+         <linkerarg value="-Wl,-z,nocopyreloc" /> 
+         <linkerarg value="${env.TARGET_OS_PATH}/lib/libc.so" /> 
+         <linkerarg value="${env.TARGET_OS_PATH}/lib/libdl.so" /> 
+<!--         <linkerarg value="${env.TARGET_OS_PATH}/lib/libstdc++.so" /> -->
+         <linkerarg value="${env.TARGET_OS_PATH}/lib/libm.so" /> 
+<!--         <linkerarg value="${env.TARGET_OS_PATH}/lib/crtbegin_dynamic.o" /> -->
+         <linkerarg value="-Wl,--no-undefined" /> 
+         <linkerarg value="-Wl,-rpath-link=${env.TARGET_OS_PATH}/lib" /> 
+         <linkerarg value="${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/${env.TARGET_CPU_NAME}/libgcc.a" />
+    <!--     <linkerarg value="${env.TARGET_OS_PATH}/lib/crtend_android.o" /> -->
+    </linker>
+
+</target>
+
+<target name="gluegen.cpptasks.declare.compiler" depends="setup.java.home.dir">
+  <echo message="Custom forced Linux.x86 cross compile android" />
+  <property name="isLinuxArmv7"    value="true"/>
+  <property name="compiler.cfg.id.base"          value="compiler.cfg.android" /> 
+  <property name="linker.cfg.id.base"            value="linker.cfg.android" /> 
+  <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
+  <property name="java.includes.dir.platform"    value="${java.includes.dir}/linux" />
+</target>
+
+<target name="declare.linux.android">
+      <echo message="android.arm" />
+      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
+      <property name="linker.cfg.id"                        value="linker.cfg.android" />
+</target>
+
+</project>
+
+
diff --git a/make/scripts/make.gluegen.all.android-arm.sh b/make/scripts/make.gluegen.all.android-arm.sh
new file mode 100755
index 0000000..631d7e3
--- /dev/null
+++ b/make/scripts/make.gluegen.all.android-arm.sh
@@ -0,0 +1,80 @@
+#! /bin/sh
+
+
+export NDK_ROOT=/usr/local/android-ndk-r6
+NDK_TOOLCHAIN=$NDK_ROOT/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/arm-linux-androideabi
+
+export PATH="$NDK_TOOLCHAIN/bin:$PATH"
+
+#ANDROID_VERSION=8
+
+ANDROID_VERSION=9
+export GCC_VERSION=4.4.3
+HOST_ARCH=linux-x86
+export TARGET_ARCH=arm-linux-androideabi
+# mcpu: cortex-a8', `cortex-a9', `cortex-r4', `cortex-r4f', `cortex-m3', `cortex-m1', `xscale', `iwmmxt', `iwmmxt2', `ep9312'. 
+TARGET_CPU_ARCH=
+export TARGET_CPU_NAME=armv7-a
+TARGET_CPU_TUNE=armv7-a
+# mfpu: `vfp', `vfpv3', `vfpv3-d16' and `neon'
+TARGET_FPU_NAME=vfpv3
+TARGET_FPU_ABI=softfp
+
+export TARGET_TOOL_PATH=${NDK_ROOT}/toolchains/${TARGET_ARCH}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
+
+export TARGET_OS_PATH=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm/usr
+export HOST_OS_PATH=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-x86/usr
+
+export NDK_XBIN_PATH=${TARGET_TOOL_PATH}/bin
+export NDK_BIN_PATH=${TARGET_TOOL_PATH}/${TARGET_ARCH}/bin
+
+export NDK_GCC=${NDK_XBIN_PATH}/${TARGET_ARCH}-gcc
+export NDK_AR=${NDK_XBIN_PATH}/${TARGET_ARCH}-ar
+export NDK_STRIP=${NDK_XBIN_PATH}/${TARGET_ARCH}-strip
+export NDK_READELF=${NDK_XBIN_PATH}/${TARGET_ARCH}-readelf
+
+export PATH=${NDK_XBIN_PATH}:$PATH
+
+export NDK_INCLUDE="-I${TARGET_OS_PATH}/include"
+
+
+export NDK_CFLAGS="\
+-march=${TARGET_CPU_NAME} \
+-fpic \
+-DANDROID \
+"
+#/usr/local/android-ndk-r6/toolchains/x86-4.4.3/prebuilt/linux-x86/lib/gcc/i686-android-linux/4.4.3
+
+export NDK_LDFLAGS="\
+-Wl,--demangle \
+-nostdlib -Bdynamic -Wl,-dynamic-linker,/system/bin/linker -Wl,--gc-sections -Wl,-z,nocopyreloc \
+${TARGET_OS_PATH}/lib/libc.so \
+${TARGET_OS_PATH}/lib/libstdc++.so \
+${TARGET_OS_PATH}/lib/libm.so \
+${TARGET_OS_PATH}/lib/crtbegin_dynamic.o \
+-Wl,--no-undefined -Wl,-rpath-link=${TARGET_OS_PATH}/lib \
+${TARGET_TOOL_PATH}/lib/gcc/${TARGET_ARCH}/${GCC_VERSION}/${TARGET_CPU_NAME}/libgcc.a \
+${TARGET_OS_PATH}/lib/crtend_android.o \
+"
+
+
+# directory for cc1 ${TARGET_TOOL_PATH}/libexec/gcc/${TARGET_ARCH}/${GCC_VERSION} \
+
+#arm-eabi-gcc -o hello hello.c -Wl,-rpath-link=/Users/nirnimesh/NIR/android/mydroid/cupcake/out/target/product/generic/obj/lib 
+#-L/Users/nirnimesh/NIR/android/mydroid/cupcake/out/target/product/generic/obj/lib 
+#-nostdlib /Users/nirnimesh/NIR/android/mydroid/cupcake/out/target/product/generic/obj/lib/crtbegin_dynamic.o -lc
+
+ant \
+    -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-android-arm.xml \
+    -Drootrel.build=build-android-arm \
+    -Dos.arch=armv7  -Dos.name=Android\
+    $* 2>&1 | tee make.gluegen.all.android-arm.log
+
+which gcc
+#$NDK_GCC -march=armv7-a -fpic -DANDROID -I/usr/local/android-ndk-r6/platforms/android-9/arch-arm/usr/include -Wl,--demangle -nostdlib -Bdynamic -Wl,-dynamic-linker,/system/bin/linker -Wl,--gc-sections -Wl,-z,nocopyreloc /usr/local/android-ndk-r6/platforms/android-9/arch-arm/usr/lib/libc.so /usr/local/android-ndk-r6/platforms/android-9/arch-arm/usr/lib/libstdc++.so /usr/local/android-ndk-r6/platforms/android-9/arch-arm/usr/lib/libm.so /usr/local/android-ndk-r6/platforms/android-9/arch-arm/usr/lib/crtbegin_dynamic.o -Wl,--no-undefined -Wl,-rpath-link=/usr/local/android-ndk-r6/platforms/android-9/arch-arm/usr/lib /usr/local/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.4.3/armv7-a/libgcc.a /usr/local/android-ndk-r6/platforms/android-9/arch-arm/usr/lib/crtend_android.o -c -fno-rtti -fPIC -DANDROID -I/home/rsantina/projects/jogamp/gluegen/build-android-arm/gensrc/native -I/home/rsantina/projects/jogamp/gluegen/build-android-arm/gensrc/native/Unix -I/opt/x86_64/jdk1.6.0_25/include -I/opt/x86_64/jdk1.6.0_25/include/linux -I/home/rsantina/projects/jogamp/gluegen/make/stub_includes/platform /home/rsantina/projects/jogamp/gluegen/src/native/unix/UnixDynamicLinkerImpl_JNI.c /home/rsantina/projects/jogamp/gluegen/src/native/common/PointerBuffer.c /home/rsantina/projects/jogamp/gluegen/src/native/common/MachineDescriptionRuntime.c /home/rsantina/projects/jogamp/gluegen/src/native/common/JVM_Tool.c
+
+#which gcc
+#echo $TARGET_TOOL_PATH
+
+#$NDK_GCC $NDK_INCLUDE $NDK_CFLAGS $NDK_LDFLAGS -o /home/rsantina/projects/jogamp/gluegen/src/native/unix/UnixDynamicLinkerImpl_JNI.c /home/rsantina/projects/jogamp/gluegen/src/native/common/PointerBuffer.c /home/rsantina/projects/jogamp/gluegen/src/native/common/MachineDescriptionRuntime.c /home/rsantina/projects/jogamp/gluegen/src/native/common/JVM_Tool.c
+
diff --git a/src/native/common/JVM_Tool.c b/src/native/common/JVM_Tool.c
index 652d946..043ad8b 100644
--- a/src/native/common/JVM_Tool.c
+++ b/src/native/common/JVM_Tool.c
@@ -37,6 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
+#include <stdio.h> //required by android to identify NULL
 #include <jni.h>
 
 #include "com_jogamp_common_jvm_JVMUtil.h"