diff options
| author | Sven Gothel <[email protected]> | 2013-01-31 21:35:55 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-01-31 21:35:55 +0100 |
| commit | 953027a1c9e7d6757485605dc64514766afec79c (patch) | |
| tree | 0ff45c54d250df7a642a54a11341be911ca1fcde /jenkins-server-slave-setup | |
| parent | 4e12876f3066e0f52fb01e2ac64373c742928e36 (diff) | |
Android Node: Bump to android-ndk-r8d, GCC 4.7
Diffstat (limited to 'jenkins-server-slave-setup')
| -rwxr-xr-x | jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh | 4 |
1 files changed, 3 insertions, 1 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 4ee1c06..54c39d4 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 @@ -153,7 +153,8 @@ function connect_40 { 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.4.3 + export GCC_VERSION=4.7 HOST_ARCH=linux-x86 export TARGET_TRIPLE=arm-linux-androideabi @@ -161,6 +162,7 @@ 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_VANILLA=$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 |