summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Raynsford <[email protected]>2012-11-15 17:01:27 +0000
committerSven Gothel <[email protected]>2012-12-27 05:55:57 +0100
commit7e36d6e6509328d63388d3d37b848b9162f03ccd (patch)
tree54e013004b23689c004e686be0b1e4cd5d9e0931
parent211a57c514d72735a54cd95826e9da1f915aec76 (diff)
Android build scripts: Fix env. name ANDROID_SDK_HOME -> ANDROID_HOME
Intuitively I assumed ANDROID_SDK_HOME to be pointing to the SDK root dir, however this is not true: Semantics by Android tools are: ANDROID_SDK_HOME - Users ~/.android folder ANDROID_HOME - SDK root folder
-rwxr-xr-xjenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
index 862f9d2..4ee1c06 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
@@ -143,10 +143,10 @@ function connect_40 {
export TARGET_ANT_HOME=/usr/share/ant
export NDK_ROOT=/opt-linux-x86/android-ndk
- export ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86
+ export ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86
echo NDK_ROOT $NDK_ROOT
- echo ANDROID_SDK_HOME $ANDROID_SDK_HOME
+ echo ANDROID_HOME $ANDROID_HOME
export ANDROID_VERSION=9
export SOURCE_LEVEL=1.6
@@ -161,9 +161,10 @@ function connect_40 {
export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm
# Need to add toolchain bins to the PATH.
- export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_SDK_HOME/platform-tools:$PATH"
+ export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$PATH"
export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-armv6.xml
+ export GLUEGEN_PROPERTIES_FILE=/home/jogamp/android/gluegen.properties # for key signing props
#export JUNIT_DISABLED="true"
#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"