From 11af8857cdf0c62c0b96d39d9d8ee683afed10f5 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 18 Oct 2015 19:02:23 +0900 Subject: [PATCH] android-sdk: 24.3.4 -> 24.4, android-ndk: r10c -> r10e --- pkgs/development/mobile/androidenv/addon.xml | 22 +++++++++---------- pkgs/development/mobile/androidenv/addons.nix | 4 ++-- .../mobile/androidenv/androidndk.nix | 6 ++--- .../mobile/androidenv/androidsdk.nix | 6 ++--- .../development/mobile/androidenv/default.nix | 8 +++++++ .../mobile/androidenv/support-repository.nix | 4 ++-- .../development/mobile/androidenv/support.nix | 4 ++-- 7 files changed, 31 insertions(+), 23 deletions(-) diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 9892b386d00..e5f679b54ba 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1019,11 +1019,11 @@ August 15, 2011 - + 23 - 0 - 1 + 1 + 0 Android android @@ -1032,18 +1032,18 @@ August 15, 2011 compatibility - 9553739 - fbe529716943053d0ce0d7f058d79f1a848cdff9 - support_r23.0.1.zip + 10217600 + c43a56fcd1c2aa620f6178a0ef529623ed77b3c7 + support_r23.1.zip - + - 21 + 24 Android android @@ -1052,9 +1052,9 @@ August 15, 2011 m2repository - 142136028 - acb915c5d2c730bf98303c0cd0122bedb2954cb3 - android_m2repository_r21.zip + 149070460 + 5b6d328a572172ec51dc25c3514392760e49bb81 + android_m2repository_r24.zip diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index d397cd766fb..8ed0e260459 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -259,8 +259,8 @@ in android_support_extra = buildGoogleApis { name = "android_support_extra"; src = fetchurl { - url = https://dl.google.com/android/repository/support_r23.0.1.zip; - sha1 = "fbe529716943053d0ce0d7f058d79f1a848cdff9"; + url = https://dl.google.com/android/repository/support_r23.1.zip; + sha1 = "c43a56fcd1c2aa620f6178a0ef529623ed77b3c7"; }; meta = { description = "Android Support Library"; diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index cc1c2810524..595c98f76aa 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -6,16 +6,16 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "android-ndk-r10c"; + name = "android-ndk-r10e"; src = if stdenv.system == "i686-linux" then fetchurl { url = "http://dl.google.com/android/ndk/${name}-linux-x86.bin"; - sha256 = "0gyq68zrpzj3gkh81czs6r0jmikg5rwzh1bqg4rk16g2nxm4lll3"; + sha256 = "1xbxra5v3bm6cmxyx8yyya5r93jh5m064aibgwd396xdm8jpvc4j"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.bin"; - sha256 = "126rqzkmf8xz1hqdziwx81yln17hpivs2j45rxhzdr45iw9b758c"; + sha256 = "0nhxixd0mq4ib176ya0hclnlbmhm8f2lab6i611kiwbzyqinfb8h"; } else throw "platform ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 055c307f2cc..02c1546ace7 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "24.3.4"; + version = "24.4"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz"; - sha1 = "fb293d7bca42e05580be56b1adc22055d46603dd"; + sha1 = "eec87cdb9778718e4073b4ca326a46cdd084f901"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip"; - sha1 = "128f10fba668ea490cc94a08e505a48a608879b9"; + sha1 = "a9b6f025a9691aef430b19b52e01844dbbcbf6b4"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 86d82abbea4..d975b5fa839 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -164,6 +164,14 @@ rec { useGoogleAPIs = true; }; + androidsdk_6_0_extras = androidsdk { + platformVersions = [ "23" ]; + abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index 436936f7c42..0e60768a4cc 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "21"; + version = "24"; name = "android-support-repository-r${version}"; src = fetchurl { url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip"; - sha1 = "acb915c5d2c730bf98303c0cd0122bedb2954cb3"; + sha1 = "5b6d328a572172ec51dc25c3514392760e49bb81"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix index 17125c60dd2..28587f494fb 100644 --- a/pkgs/development/mobile/androidenv/support.nix +++ b/pkgs/development/mobile/androidenv/support.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "23.0.1"; + version = "23.1"; name = "android-support-r${version}"; src = fetchurl { url = "https://dl.google.com/android/repository/support_r${version}.zip"; - sha1 = "fbe529716943053d0ce0d7f058d79f1a848cdff9"; + sha1 = "c43a56fcd1c2aa620f6178a0ef529623ed77b3c7"; }; buildCommand = ''