From e7ec0ba30aa3d8b5e8e835770fb92d7a4e356f76 Mon Sep 17 00:00:00 2001
From: Michael Hudson <michael.hudson@linaro.org>
Date: Wed, 23 Mar 2011 10:58:31 +1300
Subject: more refactoring

---
 build-scripts/build-android           | 16 +++-------------
 build-scripts/build-android-toolchain | 23 +++--------------------
 build-scripts/helpers                 | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 33 deletions(-)
 create mode 100644 build-scripts/helpers

(limited to 'build-scripts')

diff --git a/build-scripts/build-android b/build-scripts/build-android
index 0f41693..372f605 100755
--- a/build-scripts/build-android
+++ b/build-scripts/build-android
@@ -1,18 +1,8 @@
 #!/bin/sh
 
-# Defaults
-MANIFEST_REPO="${MANIFEST_REPO-git://http://android.git.kernel.org/platform/manifest.git}"
-MANIFEST_BRANCH="${MANIFEST_BRANCH-master}"
-MANIFEST_FILENAME="${MANIFEST_FILENAME-default.xml}"
-
-repo init -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}"
-
-time python -c 'import xmlrpclib, sys; print xmlrpclib.ServerProxy(sys.argv[1]).mirror(open(".repo/manifest.xml").read())' "http://${1}:8080" > temp-manifest.xml
-echo "Received modified manifest"
-cat temp-manifest.xml
-echo ----------------------------
-mv temp-manifest.xml .repo/manifest.xml
-repo sync -j8
+source "${BUILD_SCRIPT_ROOT}"/helpers
+
+repo-sync-from-mirror
 
 . build/envsetup.sh
 
diff --git a/build-scripts/build-android-toolchain b/build-scripts/build-android-toolchain
index 418be19..25d96e3 100755
--- a/build-scripts/build-android-toolchain
+++ b/build-scripts/build-android-toolchain
@@ -8,29 +8,16 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
 
+source "${BUILD_SCRIPT_ROOT}"/helpers
+
 # BINUTILS_URL - set this in env to override default binutils version shipped by a version downloaded from ftp
 BINUTILS_VERSION=2.21
 # GCC_URL - set this in env to override default gcc version shipped by a version downloaded from ftp
 GCC_VERSION=4.6+linaro
 
 EABI="${EABI-arm-eabi}"
-MANIFEST_REPO="${MANIFEST_REPO-git://http://android.git.kernel.org/platform/manifest.git}"
-MANIFEST_BRANCH="${MANIFEST_BRANCH-master}"
-MANIFEST_FILENAME="${MANIFEST_FILENAME-default.xml}"
-
-repo init -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}"
-
-time python -c 'import xmlrpclib, sys; print xmlrpclib.ServerProxy(sys.argv[1]).mirror(open(".repo/manifest.xml").read())' "http://${1}:8080" > temp-manifest.xml
-echo "Received modified manifest"
-cat temp-manifest.xml
-echo ----------------------------
-mv temp-manifest.xml .repo/manifest.xml
-repo sync -j8
 
-wget http://dl.google.com/android/ndk/android-ndk-r5-linux-x86.tar.bz2
-
-tar xvjf android-ndk-r5-linux-x86.tar.bz2
-rm -f android-ndk-r5-linux-x86.tar.bz2
+repo-sync-from-mirror
 
 cpuc=`cat /proc/cpuinfo  | grep processor | wc -l`
 threads=$(($cpuc * 4))
@@ -63,7 +50,3 @@ cd objdir/
 
 time -p make -j${threads}
 
-# here submit stuff back:
-#  + logs
-#  + build results
-
diff --git a/build-scripts/helpers b/build-scripts/helpers
new file mode 100644
index 0000000..3942a73
--- /dev/null
+++ b/build-scripts/helpers
@@ -0,0 +1,15 @@
+repo-sync-from-mirror () {
+    EABI="${EABI-arm-eabi}"
+    MANIFEST_REPO="${MANIFEST_REPO-git://http://android.git.kernel.org/platform/manifest.git}"
+    MANIFEST_BRANCH="${MANIFEST_BRANCH-master}"
+    MANIFEST_FILENAME="${MANIFEST_FILENAME-default.xml}"
+
+    repo init -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}"
+
+    time python -c 'import xmlrpclib, sys; print xmlrpclib.ServerProxy(sys.argv[1]).mirror(open(".repo/manifest.xml").read())' "http://${1}:8080" > temp-manifest.xml
+    echo "Received modified manifest"
+    cat temp-manifest.xml
+    echo ----------------------------
+    mv temp-manifest.xml .repo/manifest.xml
+    repo sync -j8
+}
\ No newline at end of file
-- 
cgit v1.2.3