diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index fb5d324d7789..635d0ae964f6 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -731,13 +731,63 @@ August 15, 2011 - + google + Google Inc. + google_tv_addon + Google TV Addon + 13 + 1 + Android + Google TV, API 13 + http://developer.android.com/ + + + + 87721879 + b73f7c66011ac8180b44aa4e83b8d78c66ea9a09 + google_tv-13_r01.zip + + + + + + + google Google Inc. google_apis Google APIs Android + Google APIs 17 + 3 + + + com.google.android.maps + + + com.android.future.usb.accessory + + + com.google.android.media.effects + + + + + 137156978 + 8246f61d24f0408c8e7bc352a1e522b7e2b619ba + google_apis-17_r03.zip + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 18 1 @@ -752,9 +802,9 @@ August 15, 2011 - 132568033 - 62cb086f11e15713878c8834d58ef1a2454c19a4 - google_apis-17_r01.zip + 147899839 + 5c0c24f04e6b65c61da83408b7aee79228c24a40 + google_apis-18_r01.zip @@ -763,8 +813,8 @@ August 15, 2011 - - 11 + + 18 Android android Android Support Library @@ -772,9 +822,27 @@ August 15, 2011 compatibility - 1264808 - d30d182d8e4c86bb4464c03a83ccffce7bc84ecd - support_r11.zip + 4438319 + bd67b4b8a6bac629f24c8aea75c3619a26d9a568 + support_r18.zip + + + + + + + + 2 + Android + android + Android Support Repository + Local Maven repository for Support Libraries + m2repository + + + 3705797 + c4284e4bf17a1e8bafc96a18de36984022d5a46a + android_m2repository_r02.zip @@ -782,6 +850,23 @@ August 15, 2011 + + google + Google Inc. + Google Repository + m2repository + 1 + Local Maven repository for Google Libraries + + + + 660833 + d9a20d960f0d9a8de61a9ced5fc6c2c605f6c6c0 + google_m2repository_r01.zip + + + + google Google Inc. @@ -807,14 +892,14 @@ August 15, 2011 Google Play APK Expansion Library play_apk_expansion market_apk_expansion - 2 + 3 Google Play APK Expansion library http://developer.android.com/guide/market/expansion-files.html - 111636 - 47fa8c691fcc8cf815e7ebbf140f12e94495f73b - market_apk_expansion-r02.zip + 110201 + 5305399dc1a56814e86b8459ce24871916f78b8c + market_apk_expansion-r03.zip @@ -825,34 +910,34 @@ August 15, 2011 Google Inc. Google Play services google_play_services - 4 + 9 Google Play Services client library and sample code https://developers.google.com/android/google-play-services/index - 3732458 - bbb3d11225fcf60a0bae75afa2c4737010468bf6 - google_play_services_2012110_r04.zip + 5125755 + 3e31fc0b982f938edf216afe9e532774db12607a + google_play_services_3159130_r09.zip - + google Google Inc. Google USB Driver usb_driver - 7 - USB Driver for Windows, revision 7 + 8 + USB Driver for Windows, revision 8 http://developer.android.com/ - 8681704 - 147c339fde22f98ae41b15349a8303d39a2cf6e5 - usb_driver_r07-windows.zip + 8682230 + 2b2f91098a984a865a70f0bd841a843fb54462fc + usb_driver_r08-windows.zip @@ -863,14 +948,14 @@ August 15, 2011 Google Play Billing Library play_billing market_billing - 3 + 4 Google Play Billing files and sample code http://developer.android.com/google/play/billing/index.html - 435718 - a133d454c992ef2a18e62fa810e8185f1be4b054 - play_billing_r03.zip + 437084 + 38fdae51dadb6d1e63e177adba3e4d96b751686e + play_billing_r04.zip @@ -881,14 +966,14 @@ August 15, 2011 Google Inc. Google AdMob Ads SDK admob_ads_sdk - 8 + 11 AdMob Ads SDK https://developers.google.com/mobile-ads-sdk/docs/ - 545547 - 031476aa5a491239d2624e8de8c9e46e40d93e3f - https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.2.1.zip + 704512 + 0102859d9575baa0bf4fd5eb422af2ad0fe6cb82 + https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.4.1.zip @@ -897,16 +982,16 @@ August 15, 2011 google Google Inc. - Google Analytics SDK - analytics_sdk - 2 - Analytics SDK - http://code.google.com/mobile/analytics/ + Google Analytics App Tracking SDK + analytics_sdk_v2 + 3 + Analytics App Tracking SDK + http://developers.google.com/analytics/devguides/collection/ - 53055 - 328bcdc6c241879ebb04d6edc6fec1052a171004 - https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_1.4.2.zip + 211432 + dc14026bf0ce78315cb5dd00552607de0894de83 + https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_2.0beta5.zip @@ -933,10 +1018,10 @@ August 15, 2011 google Google Inc. - Google Cloud Messaging for Android Library + [Deprecated] Google Cloud Messaging for Android Library gcm 3 - Google Cloud Messaging for Android library and sample code + GCM library has been moved to Google Play Services (com.google.android.gms.gcm) and this standalone version is no longer supported https://developers.google.com/android/gcm/index diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index f26db5c2cb73..651c84533f06 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -185,8 +185,20 @@ in google_apis_17 = buildGoogleApis { name = "google_apis-17"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-17_r01.zip; - sha1 = "62cb086f11e15713878c8834d58ef1a2454c19a4"; + url = https://dl-ssl.google.com/android/repository/google_apis-17_r03.zip; + sha1 = "8246f61d24f0408c8e7bc352a1e522b7e2b619ba"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + + google_apis_18 = buildGoogleApis { + name = "google_apis-18"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-18_r01.zip; + sha1 = "5c0c24f04e6b65c61da83408b7aee79228c24a40"; }; meta = { description = "Android + Google APIs"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index e8e1f919fe4e..98bf7ff2ee9d 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,23 +1,23 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper -, platformTools, support, platforms, sysimages, addons +, platformTools, buildTools, support, platforms, sysimages, addons , zlib_32bit -, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp +, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa , freetype, fontconfig, gtk, atk }: {platformVersions, useGoogleAPIs}: stdenv.mkDerivation { - name = "android-sdk-21"; + name = "android-sdk-22.05"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://dl.google.com/android/android-sdk_r21-linux.tgz; - md5 = "7f8d73b629f808cdcfc9f9900bbd7580"; + url = http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz; + md5 = "8201b10c21510f082c54f58a9bb082c8"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://dl.google.com/android/android-sdk_r21-macosx.zip; - md5 = "67e46adca90dd18d7291443f6c15d6af"; + url = http://dl.google.com/android/android-sdk_r22.0.5-macosx.zip; + md5 = "94f3cbe896c332b94ee0408ae610a4b8"; } else throw "platform not ${stdenv.system} supported!"; @@ -61,14 +61,14 @@ stdenv.mkDerivation { for i in emulator emulator-arm emulator-mips emulator-x86 do wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib + --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib done ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' for i in emulator64-arm emulator64-mips emulator64-x86 do wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib + --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib done ''} ''} @@ -107,6 +107,7 @@ stdenv.mkDerivation { cd .. ln -s ${platformTools}/platform-tools + ln -s ${buildTools}/build-tools ln -s ${support}/support # Symlink required Google API add-ons diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix new file mode 100644 index 000000000000..0d9cbc220803 --- /dev/null +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -0,0 +1,54 @@ +{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: + +stdenv.mkDerivation { + name = "android-build-tools-r18.0.1"; + 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"; + } + 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"; + } + else throw "System ${stdenv.system} not supported!"; + + buildCommand = '' + mkdir -p $out/build-tools + cd $out/build-tools + unzip $src + + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + '' + cd android-* + + # Patch the interpreter + for i in aapt aidl dexdump llvm-rs-cc + do + patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + done + + # These binaries need to find libstdc++ and libgcc_s + for i in aidl libLLVM.so + do + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i + done + + # These binaries need to find libstdc++, libgcc_s and libraries in the current folder + for i in libbcc.so libbcinfo.so libclang.so llvm-rs-cc + do + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:`pwd` $i + done + + # These binaries need to find libstdc++, libgcc_s, and zlib + for i in aapt dexdump + do + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i + done + ''} + + patchShebangs . + ''; + + buildInputs = [ unzip ]; +} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index a76deb98b6ee..2191a0953bf4 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -3,10 +3,15 @@ rec { platformTools = import ./platform-tools.nix { inherit (pkgs) stdenv fetchurl unzip; - inherit (pkgs_i686) zlib ncurses; stdenv_32bit = pkgs_i686.stdenv; }; + buildTools = import ./build-tools.nix { + inherit (pkgs) stdenv fetchurl unzip; + stdenv_32bit = pkgs_i686.stdenv; + zlib_32bit = pkgs_i686.zlib; + }; + support = import ./support.nix { inherit (pkgs) stdenv fetchurl unzip; }; @@ -31,10 +36,10 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) freetype fontconfig gtk atk; + inherit (pkgs) freetype fontconfig gtk atk mesa; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp; - inherit platformTools support platforms sysimages addons; + inherit platformTools buildTools support platforms sysimages addons; stdenv_32bit = pkgs_i686.stdenv; zlib_32bit = pkgs_i686.zlib; @@ -43,6 +48,7 @@ rec { libXau_32bit = pkgs_i686.xorg.libXau; libXdmcp_32bit = pkgs_i686.xorg.libXdmcp; libXext_32bit = pkgs_i686.xorg.libXext; + mesa_32bit = pkgs_i686.mesa; }; androidsdk_4_1 = androidsdk { diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh index 983d8bde87b9..8ac4ad328f44 100755 --- a/pkgs/development/mobile/androidenv/generate-platforms.sh +++ b/pkgs/development/mobile/androidenv/generate-platforms.sh @@ -1,4 +1,4 @@ #!/bin/sh -e -xsltproc --stringparam os linux generate-platforms.xsl repository-7.xml > platforms-linux.nix -xsltproc --stringparam os macosx generate-platforms.xsl repository-7.xml > platforms-macosx.nix +xsltproc --stringparam os linux generate-platforms.xsl repository-8.xml > platforms-linux.nix +xsltproc --stringparam os macosx generate-platforms.xsl repository-8.xml > platforms-macosx.nix diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl index 1802ae63efe1..249f044550b1 100644 --- a/pkgs/development/mobile/androidenv/generate-platforms.xsl +++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl @@ -1,7 +1,7 @@ + xmlns:sdk="http://schemas.android.com/sdk/android/repository/8"> diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh index dc28c27f45f0..ae4b4f35a37e 100755 --- a/pkgs/development/mobile/androidenv/generate-sysimages.sh +++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh @@ -1,3 +1,3 @@ #!/bin/sh -e -xsltproc generate-sysimages.xsl repository-7.xml > sysimages.nix +xsltproc generate-sysimages.xsl repository-8.xml > sysimages.nix diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl index 1224ebbd4e8d..6036595eb9ac 100644 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl @@ -2,7 +2,7 @@ + xmlns:sdk="http://schemas.android.com/sdk/android/repository/8"> diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 554996082909..191521bb6549 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,15 +1,15 @@ -{stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}: +{stdenv, stdenv_32bit, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-platform-tools-r16"; + name = "android-platform-tools-r18.0.1"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r16-linux.zip; - sha1 = "84d563ae5e324f223f335f11bf511bf6207c05fb"; + url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-linux.zip; + sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r16-macosx.zip; - sha1 = "fbb0f8d2786a83b8c3eb6df402e706e136db8fed"; + url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-macosx.zip; + sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387"; } else throw "System ${stdenv.system} not supported!"; @@ -21,20 +21,12 @@ stdenv.mkDerivation { ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' - for i in aapt adb aidl dexdump fastboot llvm-rs-cc + for i in adb fastboot do patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i done - - patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib aapt - patchelf --set-rpath ${ncurses}/lib:${stdenv_32bit.gcc.gcc}/lib adb - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib aidl - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib fastboot - patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib dexdump - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib llvm-rs-cc ''} - - patchShebangs . ''; buildInputs = [ unzip ]; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index f544fcc08bed..2ca937b5534e 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -185,23 +185,35 @@ in platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r03.zip; - sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e"; + url = https://dl-ssl.google.com/android/repository/android-16_r04.zip; + sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee"; }; meta = { - description = "Android SDK Platform 4.1"; + description = "Android SDK Platform 4.1.2"; }; }; platform_17 = buildPlatform { - name = "android-platform-4.2"; + name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r01.zip; - sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025"; + url = https://dl-ssl.google.com/android/repository/android-17_r02.zip; + sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec"; }; meta = { - description = "Android SDK Platform 4.2"; + description = "Android SDK Platform 4.2.2"; + + }; + }; + + platform_18 = buildPlatform { + name = "android-platform-4.3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; + sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + }; + meta = { + description = "Android SDK Platform 4.3"; }; }; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index a1434bbe56c1..c89cb9ed1272 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -185,23 +185,35 @@ in platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r03.zip; - sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e"; + url = https://dl-ssl.google.com/android/repository/android-16_r04.zip; + sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee"; }; meta = { - description = "Android SDK Platform 4.1"; + description = "Android SDK Platform 4.1.2"; }; }; platform_17 = buildPlatform { - name = "android-platform-4.2"; + name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r01.zip; - sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025"; + url = https://dl-ssl.google.com/android/repository/android-17_r02.zip; + sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec"; }; meta = { - description = "Android SDK Platform 4.2"; + description = "Android SDK Platform 4.2.2"; + + }; + }; + + platform_18 = buildPlatform { + name = "android-platform-4.3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; + sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + }; + meta = { + description = "Android SDK Platform 4.3"; }; }; diff --git a/pkgs/development/mobile/androidenv/repository-7.xml b/pkgs/development/mobile/androidenv/repository-8.xml similarity index 85% rename from pkgs/development/mobile/androidenv/repository-7.xml rename to pkgs/development/mobile/androidenv/repository-8.xml index 7bbbaf1e3620..4e180ac4b3e6 100644 --- a/pkgs/development/mobile/androidenv/repository-7.xml +++ b/pkgs/development/mobile/androidenv/repository-8.xml @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. --> - + Terms and Conditions @@ -570,33 +570,33 @@ November 13, 2012 - - 3 - Android SDK Platform 4.1 + + 4 + Android SDK Platform 4.1.2 4.1.2 16 - 20 + 21 - 8 + 9 1 - 47995505 - 80d9ffef58168f9bccd862830e2ee51f686b167e - android-16_r03.zip + 48005140 + 90b9157b8b45f966be97e11a22fba4591b96c2ee + android-16_r04.zip - - 1 - Android SDK Platform 4.2 - 4.2 + + 2 + Android SDK Platform 4.2.2 + 4.2.2 17 21 @@ -607,9 +607,32 @@ November 13, 2012 - 47886130 - c2e7c8c8db40e06b804ddb1725ac2c3555b55025 - android-17_r01.zip + 48057484 + c442c32c1b702173ab0929a74486e4f86fe528ec + android-17_r02.zip + + + + + + + + 1 + Android SDK Platform 4.3 + 4.3 + 18 + + 21 + + + 9 + 1 + + + + 48752456 + c24de91d6f296cf453701aef281609779fffb379 + android-18_r01.zip @@ -666,16 +689,32 @@ November 13, 2012 - - 1 - Android SDK Platform 4.2 + + 2 + Android SDK Platform 4.2.2 17 armeabi-v7a - 116831648 - 45b9344473e0a6d063c2b1fe58d8cd47d307905e - sysimg_armv7a-17_r01.zip + 116553808 + 1c321cda1af793b84d47d1a8d15f85444d265e3c + sysimg_armv7a-17_r02.zip + + + + + + + + 1 + Android SDK Platform 4.3 + 18 + armeabi-v7a + + + 125597583 + 5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e + sysimg_armv7a-18_r01.zip @@ -866,89 +905,134 @@ November 13, 2012 + + + 1 + 18 + + + 19897793 + 73e879ce46c04a6e63ad1a9107018b4782945007 + samples-18_r01.zip + + + + + - + - 16 + 18 + 0 + 1 - 11938435 - 0d6245b685c7d303cf4a054a3d373c4427b7ad01 - platform-tools_r16-windows.zip + 954769 + b40fea3ed72296dd42dd616a7abf536b8dace20d + platform-tools_r18.0.1-windows.zip - 12676089 - 84d563ae5e324f223f335f11bf511bf6207c05fb - platform-tools_r16-linux.zip + 1011194 + cf9bdbbaa34da37b59724f914dad907c2c74a387 + platform-tools_r18.0.1-linux.zip - 13147351 - fbb0f8d2786a83b8c3eb6df402e706e136db8fed - platform-tools_r16-macosx.zip + 971087 + 126325cbb55928c38acbb9c7bb5d9145d94fad56 + platform-tools_r18.0.1-macosx.zip - + - - + + - 21 + 17 + 0 + 0 - - 16 - - 98982670 - 57bbfadcedbef44fc322e5e037666393668cf3fe - tools_r21-windows.zip + 11004914 + 899897d327b0bad492d3a40d3db4d96119c15bc0 + build-tools_r17-windows.zip - 91495104 - 013b9c04407a9d73b8bf3c574327fbe870acd264 - tools_r21-linux.zip + 11696007 + 2c2872bc3806aabf16a12e3959c2183ddc866e6d + build-tools_r17-linux.zip - 65767130 - fcfa3a6932f2ed0d970a0ca959bb2b4972f7d46d - tools_r21-macosx.zip + 12208114 + 602ee709be9dbb8f179b1e4075148a57f9419930 + build-tools_r17-macosx.zip - + - - + + + + - 21 + 18 0 1 - 1 + + + + 15413527 + a6c2afd0b6289d589351956d2f5212b37014ca7d + build-tools_r18.0.1-windows.zip + + + 16627330 + f11618492b0d2270c332325d45d752d3656a9640 + build-tools_r18.0.1-linux.zip + + + 16633121 + d84f5692fb44d60fc53e5b2507cebf9f24626902 + build-tools_r18.0.1-macosx.zip + + + + + + + + + + + 22 + 0 + 5 - 16 + 18 - 98998088 - 1503aaf2c91cb07c0240a2db3af0de027941a4f6 - tools_r21.0.1_rc1-windows.zip + 113389691 + a3f450706b5374122f0edb76a4488462ba5171ca + tools_r22.0.5-windows.zip - 91510079 - 183670a7f9878d8d3693d5fcf32e1357b69f0fed - tools_r21.0.1_rc1-linux.zip + 105904090 + 06a3e1d66b9280cba49c7ba1893ea14beae072d2 + tools_r22.0.5-linux.zip - 65777178 - 109d4f287904875f067e021be3fd1f549e6afb67 - tools_r21.0.1_rc1-macosx.zip + 77191184 + 318947edef0ab46603eb7f4d21333ee4b4fa1ff3 + tools_r22.0.5-macosx.zip @@ -957,14 +1041,14 @@ November 13, 2012 - + 1 - 17 + 18 - 171564393 - fb988cdd2beaac0dd47dc630821ccc30557c67e5 - docs-17_r01.zip + 142332266 + 83632d157781d31f2a8e52acad5c4c5d0f307cba + docs-18_r01.zip @@ -1027,4 +1111,18 @@ November 13, 2012 + + + + 1 + 18 + + + 20226735 + 8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78 + sources-18_r01.zip + + + + diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix index 2e9690de7a26..ca1988527e2c 100644 --- a/pkgs/development/mobile/androidenv/support.nix +++ b/pkgs/development/mobile/androidenv/support.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-support-r11"; + name = "android-support-r18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r11.zip; - sha1 = "d30d182d8e4c86bb4464c03a83ccffce7bc84ecd"; + url = https://dl-ssl.google.com/android/repository/support_r18.zip; + sha1 = "bd67b4b8a6bac629f24c8aea75c3619a26d9a568"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index b35b42989838..71a97126935c 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -41,8 +41,16 @@ in sysimg_17 = buildSystemImage { name = "armeabi-v7a-17"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r01.zip; - sha1 = "45b9344473e0a6d063c2b1fe58d8cd47d307905e"; + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r02.zip; + sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c"; + }; + }; + + sysimg_18 = buildSystemImage { + name = "armeabi-v7a-18"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r01.zip; + sha1 = "5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e"; }; };