android-sdk: upgrade to latests versions

This commit is contained in:
Mathijs Kwik 2013-09-18 13:07:47 +02:00
parent 1751f77b6a
commit 5eeb02f67c
3 changed files with 26 additions and 5 deletions

View file

@ -1,15 +1,15 @@
{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}:
stdenv.mkDerivation {
name = "android-build-tools-r18.0.1";
name = "android-build-tools-r18.1.0";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then fetchurl {
url = https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-linux.zip;
sha1 = "f11618492b0d2270c332325d45d752d3656a9640";
url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-linux.zip;
sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-macosx.zip;
sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902";
url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-macosx.zip;
sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8";
}
else throw "System ${stdenv.system} not supported!";

View file

@ -64,6 +64,12 @@ rec {
useGoogleAPIs = true;
};
androidsdk_4_3 = androidsdk {
platformVersions = [ "18" ];
abiVersions = [ "armeabi-v7a" "x86" ];
useGoogleAPIs = true;
};
buildApp = import ./build-app.nix {
inherit (pkgs) stdenv jdk ant;
inherit androidsdk;

View file

@ -0,0 +1,15 @@
#!/bin/sh
# this shows a list of available xmls
android list sdk | grep 'Parse XML:' | cut -f8- -d\ # | xargs -n 1 curl -O
# we skip the intel addons, as they are Windows+osX only
# we skip the default sys-img (arm?) because it is empty
curl -o repository-8.xml https://dl-ssl.google.com/android/repository/repository-8.xml
curl -o addon.xml https://dl-ssl.google.com/android/repository/addon.xml
curl -o sys-img-mips.xml https://dl-ssl.google.com/android/repository/sys-img/mips/sys-img.xml
curl -o sys-img-x86.xml https://dl-ssl.google.com/android/repository/sys-img/x86/sys-img.xml
./generate-addons.sh
./generate-platforms.sh
./generate-sysimages.sh