From 7c545f6d0d19bb04b6ac33a7123232f9697c08ae Mon Sep 17 00:00:00 2001 From: Xavier Hallade Date: Fri, 9 Jan 2015 15:53:45 +0100 Subject: added support for Android x86 platforms --- make/build.xml | 19 ++++- make/scripts/adb-install-all-x86.sh | 4 + make/scripts/adb-reinstall-all-x86.sh | 5 ++ make/scripts/make.joal.all.android-x86-cross.sh | 104 ++++++++++++++++++++++++ make/scripts/make.joal.all.sh | 1 + 5 files changed, 132 insertions(+), 1 deletion(-) create mode 100755 make/scripts/adb-install-all-x86.sh create mode 100755 make/scripts/adb-reinstall-all-x86.sh create mode 100755 make/scripts/make.joal.all.android-x86-cross.sh diff --git a/make/build.xml b/make/build.xml index 51cd328..0c07a5c 100755 --- a/make/build.xml +++ b/make/build.xml @@ -481,6 +481,23 @@ + + + + + + + + + + + + + + + + + @@ -634,7 +651,7 @@ + depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler, c.build.openal.use-blobs, c.build.openal.soft.windows, c.build.openal.soft.android.x86, c.build.openal.soft.android.arm, c.build.openal.soft.android.arm64, c.build.openal.soft.gcc.armv6.soft, c.build.openal.soft.gcc.armv6.hard, c.build.openal.soft.clang.x86_32, c.build.openal.soft.clang.default, c.build.openal.soft.gcc.x86_32, c.build.openal.soft.gcc.default"> diff --git a/make/scripts/adb-install-all-x86.sh b/make/scripts/adb-install-all-x86.sh new file mode 100755 index 0000000..d72a0e3 --- /dev/null +++ b/make/scripts/adb-install-all-x86.sh @@ -0,0 +1,4 @@ +#adb $* install ../../gluegen/build-android-x86/jogamp-android-launcher.apk +#adb $* install ../../gluegen/build-android-x86/gluegen-rt-android-armeabi.apk +adb $* install ../build-android-x86/jar/joal-android-x86.apk +adb $* install ../build-android-x86/jar/joal-test-android.apk diff --git a/make/scripts/adb-reinstall-all-x86.sh b/make/scripts/adb-reinstall-all-x86.sh new file mode 100755 index 0000000..7db988d --- /dev/null +++ b/make/scripts/adb-reinstall-all-x86.sh @@ -0,0 +1,5 @@ +sdir=`dirname $0` + +$sdir/adb-uninstall-all.sh $* +$sdir/adb-install-all-x86.sh $* + diff --git a/make/scripts/make.joal.all.android-x86-cross.sh b/make/scripts/make.joal.all.android-x86-cross.sh new file mode 100755 index 0000000..2f3254c --- /dev/null +++ b/make/scripts/make.joal.all.android-x86-cross.sh @@ -0,0 +1,104 @@ +#! /bin/sh + +SDIR=`dirname $0` + +if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +fi + +export NODE_LABEL=. + +export HOST_UID=jogamp +# jogamp02 - 10.1.0.122 +export HOST_IP=10.1.0.122 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=panda02 +#export TARGET_IP=jautab03 +#export TARGET_IP=jauphone04 +export TARGET_ADB_PORT=5555 +# needs executable bit (probably su) +export TARGET_ROOT=/data/projects +export TARGET_ANT_HOME=/usr/share/ant + +echo ANDROID_HOME $ANDROID_HOME +echo NDK_ROOT $NDK_ROOT + +if [ -z "$NDK_ROOT" ] ; then + # + # Generic android-ndk + # + if [ -e /usr/local/android-ndk ] ; then + NDK_ROOT=/usr/local/android-ndk + elif [ -e /opt-linux-x86/android-ndk ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk + elif [ -e /opt/android-ndk ] ; then + NDK_ROOT=/opt/android-ndk + # + # Specific android-ndk-r8d + # + elif [ -e /usr/local/android-ndk-r8d ] ; then + NDK_ROOT=/usr/local/android-ndk-r8d + elif [ -e /opt-linux-x86/android-ndk-r8d ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk-r8d + elif [ -e /opt/android-ndk-r8d ] ; then + NDK_ROOT=/opt/android-ndk-r8d + else + echo NDK_ROOT is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $NDK_ROOT ] ; then + echo NDK_ROOT $NDK_ROOT does not exist + exit 1 +fi +export NDK_ROOT + +if [ -z "$ANDROID_HOME" ] ; then + if [ -e /usr/local/android-sdk-linux_x86 ] ; then + ANDROID_HOME=/usr/local/android-sdk-linux_x86 + elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then + ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86 + elif [ -e /opt/android-sdk-linux_x86 ] ; then + ANDROID_HOME=/opt/android-sdk-linux_x86 + else + echo ANDROID_HOME is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $ANDROID_HOME ] ; then + echo ANDROID_HOME $ANDROID_HOME does not exist + exit 1 +fi +export ANDROID_HOME + +export ANDROID_VERSION=9 +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +#export GCC_VERSION=4.4.3 +export GCC_VERSION=4.7 +HOST_ARCH=linux-x86 +export TARGET_TRIPLE=i686-linux-android +export TOOLCHAIN_NAME=x86 + +export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TOOLCHAIN_NAME}-${GCC_VERSION}/prebuilt/${HOST_ARCH} +export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-x86 + +# Need to add toolchain bins to the PATH. +export PATH_VANILLA=$PATH +export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/17.0.0:$PATH" + +export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-x86.xml + +#export JUNIT_DISABLED="true" +#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + +# BUILD_ARCHIVE=true \ +ant \ + -Drootrel.build=build-android-x86 \ + $* 2>&1 | tee -a make.joal-x86-cross.log + diff --git a/make/scripts/make.joal.all.sh b/make/scripts/make.joal.all.sh index a6b3a1e..f201eff 100755 --- a/make/scripts/make.joal.all.sh +++ b/make/scripts/make.joal.all.sh @@ -7,3 +7,4 @@ $SDIR/make.joal.all.linux-armv6-cross.sh \ && $SDIR/make.joal.all.linux-x86_64.sh \ && $SDIR/make.joal.all.linux-x86.sh \ && $SDIR/make.joal.all.android-armv6-cross.sh \ +&& $SDIR/make.joal.all.android-x86-cross.sh \ -- cgit v1.2.3