download-toolchain-sources.sh: Use android.googlesource.com

This patch updates all files to refer to the new location of the
AOSP source server, which is now android.googlesource.com.

It updates the download-toolchain-sources.sh script to download
from this server, using the https:// git protocol, instead of
git://

+ Remove the --git-http option since it isn't supported by
  the new servers, nor really desirable since the https://
  protocol should work across firewalls.

  In case you need an alternative, you can still use the
  --git-base option, so nothing of value was lost here.

Change-Id: I99816a4791741474708ad390f96e2ba18cea35b8

build/tools/DEV-SCRIPTS-USAGE.TXT

@@ -252,7 +252,7 @@ Note, to create a local toolchain repo:
 
    mkdir -p /tmp/ndk-$USER/toolchain
    cd /tmp/ndk-$USER/toolchain
-   repo init git://android.git.kernel.org/toolchain/manifest.git
+   repo init https://android.googlesource.com/toolchain/manifest.git
    repo sync
 
 then use with:

build/tools/dev-defaults.sh

@@ -21,7 +21,7 @@ GABIXX_SUBDIR=sources/cxx-stl/gabi++
 # root directory.
 GNUSTL_SUBDIR=sources/cxx-stl/gnu-libstdc++
 
-# The date to use when downloading toolchain sources from android.git.kernel.org
+# The date to use when downloading toolchain sources from AOSP servers
 # Leave it empty for tip of tree.
 TOOLCHAIN_GIT_DATE=2011-02-23
 

build/tools/download-toolchain-sources.sh

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 #  This shell script is used to download the sources of the Android NDK toolchain
-#  from the git server at android.git.kernel.org and package them in a nice tarball
+#  from the git server at android.googlesource.com and package them in a nice tarball
 #  that can later be used with the 'built-toolchain.sh' script.
 #
 
@@ -42,14 +42,11 @@ register_var_option "--git-date=<date>" GIT_DATE "Only sources that existed unti
 GITCMD=git
 register_var_option "--git=<executable>" GITCMD "Use this version of the git tool"
 
-OPTION_GIT_HTTP=no
-register_var_option "--git-http" OPTION_GIT_HTTP "Use http to download sources from git"
-
-OPTION_GIT_BASE=
+OPTION_GIT_BASE=https://android.googlesource.com/toolchain
 register_var_option "--git-base=<git-uri>" OPTION_GIT_BASE "Use specific git repository base"
 
 OPTION_GIT_REFERENCE=
-register_var_option "--git-reference=<path>" OPTION_GIT_REFERENCE "Use local git reference base"
+register_var_option "--git-reference=<path>" OPTION_GIT_REFERENCE "Use local git reference"
 
 OPTION_PACKAGE=no
 register_var_option "--package" OPTION_PACKAGE "Create source package in /tmp/ndk-$USER"
@@ -59,7 +56,7 @@ register_var_option "--no-patches" OPTION_NO_PATCHES "Do not patch sources"
 
 PROGRAM_PARAMETERS="<src-dir>"
 PROGRAM_DESCRIPTION=\
-"Download the NDK toolchain sources from android.git.kernel.org into <src-dir>.
+"Download the NDK toolchain sources from android.googlesource.com into <src-dir>.
 You will need to run this script before being able to rebuilt the NDK toolchain
 binaries from scratch with build/tools/build-gcc.sh."
 
@@ -67,7 +64,7 @@ if [ -n "$TOOLCHAIN_GIT_DATE" ] ; then
   PROGRAM_DESCRIPTION="$PROGRAM_DESCRIPTION\
 
 
-By default, this script will download sources from android.git.kernel.org that
+By default, this script will download sources from android.googlesource.com that
 correspond to the date of $TOOLCHAIN_GIT_DATE. If you want to use the tip of
 tree, use '--git-date=now' instead.
 
@@ -84,11 +81,6 @@ fi
 
 extract_parameters "$@"
 
-if [ -n "$OPTION_GIT_BASE" -a "$OPTION_GIT_HTTP" = "yes" ] ; then
-    echo "ERROR: You can't use --git-base and --git-http at the same time."
-    exit 1
-fi
-
 # Check that 'git' works
 $GITCMD --version > /dev/null 2>&1
 if [ $? != 0 ] ; then
@@ -118,15 +110,7 @@ rm -rf $TMPDIR && mkdir $TMPDIR
 fail_panic "Could not create temporary directory: $TMPDIR"
 
 # prefix used for all clone operations
-if [ -n "$OPTION_GIT_BASE" ] ; then
-    GITPREFIX="$OPTION_GIT_BASE"
-else
-    GITPROTO=git
-    if [ "$OPTION_GIT_HTTP" = "yes" ] ; then
-        GITPROTO=http
-    fi
-    GITPREFIX=${GITPROTO}://android.git.kernel.org/toolchain
-fi
+GITPREFIX="$OPTION_GIT_BASE"
 dump "Using git clone prefix: $GITPREFIX"
 
 GITREFERENCE=

docs/CHANGES.html

@@ -213,6 +213,9 @@ OTHER CHANGES:
   on a non-stable ABI symbol (e.g. any libgcc.a symbol that changes
   each time the toolchain used to build the platform is changed).
 
+- download-toolchain-sources.sh: Script was updated to download the toolchain
+  sources from android.googlesource.com, the new location for AOSP servers.
+
 -------------------------------------------------------------------------------
 android-ndk-r6b
 

docs/DEVELOPMENT.html

@@ -19,8 +19,8 @@ two repositories with the following:
 
   mkdir workdir
   cd workdir
-  git clone git://android.git.kernel.org/platform/ndk.git ndk
-  git clone git://android.git.kernel.org/platform/development.git development
+  git clone https://android.googlesource.com/platform/ndk.git ndk
+  git clone https://android.googlesource.com/platform/development.git development
   export NDK=`pwd`/ndk
 
 
@@ -77,7 +77,7 @@ several ways to get them:
 
       The NDK comes with several scripts that can be used to rebuild the
       binaries from scratch, after downloading their sources from
-      android.git.kernel.org.
+      android.googlesource.com.
 
       There are several ways to do that, the most naive one, which will
       always work but will be *very* long (expect a few hours on a typical
@@ -88,7 +88,7 @@ several ways to get them:
       This will perform all the steps required to rebuild the binaries,
       which include:
 
-        - downloading the sources from android.git.kernel.org
+        - downloading the sources from android.googlesource.com
         - patching them with appropriate changes, if needed
         - rebuilding everything from scratch
         - copying the generated binaries to the proper location under $NDK

docs/LICENSES.html

@@ -3,7 +3,8 @@ See the copyright disclaimers in each respective file for details.
 
 Note that the public Android NDK release packages also contain prebuilt binaries
 for the compiler, linker, archiver, etc... The source code for the toolchain is
-available at http://android.git.kernel.org/pub
+available at android.googlesource.com (you can use the script under
+build/tools/download-toolchain-sources.sh to download it automatically).
 
 The prebuilt binaries are covered by either the GNU General Public License (GPL),
 or the GNU Lesser General Public License (LGPL). For details, see the files

tests/run-tests.sh

@@ -433,7 +433,7 @@ if is_testable samples; then
         DEVNDK_DIR=`dirname $NDK`/development/ndk
         if [ ! -d "$DEVNDK_DIR" ] ; then
             dump "ERROR: Could not find development NDK directory: $DEVNDK_DIR"
-            dump "Please clone platform/development.git from android.git.kernel.org"
+            dump "Please clone platform/development.git from android.googlesource.com"
             exit 1
         fi
         SAMPLES_DIRS="$DEVNDK_DIR/samples"