[tor-commits] [orbot/master] fix ant builds by using frozen SDK

[n8fr8@xxxxxxxxxxxxxx]

commit 610abf5b79d80a37e4dbc705085f1fa69429aab8
Author: Hans-Christoph Steiner <hans@xxxxxxx>
Date:   Mon Sep 26 21:06:12 2016 +0200

    fix ant builds by using frozen SDK
    
    legacy!  This uses a copy of the Android SDK that is frozen to the last
    version that works with ant builds.
---
 jenkins-build      | 6 ++++--
 make-release-build | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jenkins-build b/jenkins-build
index 0bc0b6f..3c8546d 100755
--- a/jenkins-build
+++ b/jenkins-build
@@ -1,11 +1,13 @@
 #!/bin/bash
+# bash is required because we need bash's printf to guarantee a cross-platform
+# timestamp format.
 
 set -e
 set -x
 
 if [ -z $ANDROID_HOME ]; then
-    if [ -e ~/.android/bashrc ]; then
-        . ~/.android/bashrc
+    if [ -e ~/.android/bashrc-ant-build ]; then
+        . ~/.android/bashrc-ant-build
     else
         echo "ANDROID_HOME must be set!"
         exit
diff --git a/make-release-build b/make-release-build
index 41166c4..33980f8 100755
--- a/make-release-build
+++ b/make-release-build
@@ -27,8 +27,8 @@ fi
 
 
 if [ -z $ANDROID_HOME ]; then
-    if [ -e ~/.android/bashrc ]; then
-        . ~/.android/bashrc
+    if [ -e ~/.android/bashrc-ant-build ]; then
+        . ~/.android/bashrc-ant-build
     else
         echo "ANDROID_HOME must be set!"
         exit



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits