diff options
author | Sander van der Burg <svanderburg@gmail.com> | 2013-09-18 12:05:14 +0200 |
---|---|---|
committer | Sander van der Burg <svanderburg@gmail.com> | 2013-09-18 12:05:14 +0200 |
commit | 370db596b9d7f3619c57a05440a8c0636826bea6 (patch) | |
tree | d7bdf4d5151b9735ebcc5cc3779252d60cd4456c /pkgs/development | |
parent | 3433e62e3fcdd682a9a0a8c827e81b319332e42a (diff) | |
download | nixlib-370db596b9d7f3619c57a05440a8c0636826bea6.tar nixlib-370db596b9d7f3619c57a05440a8c0636826bea6.tar.gz nixlib-370db596b9d7f3619c57a05440a8c0636826bea6.tar.bz2 nixlib-370db596b9d7f3619c57a05440a8c0636826bea6.tar.lz nixlib-370db596b9d7f3619c57a05440a8c0636826bea6.tar.xz nixlib-370db596b9d7f3619c57a05440a8c0636826bea6.tar.zst nixlib-370db596b9d7f3619c57a05440a8c0636826bea6.zip |
Bumped Android SDK to version 22.2 and updated its addons
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/mobile/androidenv/addon.xml | 26 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/addons.nix | 4 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/androidsdk.nix | 10 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/platforms-linux.nix | 4 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/platforms-macosx.nix | 4 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/repository-8.xml | 73 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/sys-img-x86.xml | 15 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/sysimages.nix | 12 |
8 files changed, 99 insertions, 49 deletions
diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 635d0ae964f6..2020f48b1d2c 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -781,14 +781,14 @@ August 15, 2011 </sdk:add-on> <sdk:add-on> - <!-- Generated at Tue Jul 23 17:14:07 2013 from git_jb-mr2-release @ 737497 --> + <!-- Generated at Mon Aug 12 12:42:05 2013 from git_jb-mr2-dev @ 774058 --> <sdk:vendor-id>google</sdk:vendor-id> <sdk:vendor-display>Google Inc.</sdk:vendor-display> <sdk:name-id>google_apis</sdk:name-id> <sdk:name-display>Google APIs</sdk:name-display> <sdk:description>Android + Google APIs</sdk:description> <sdk:api-level>18</sdk:api-level> - <sdk:revision>1</sdk:revision> + <sdk:revision>2</sdk:revision> <sdk:libs> <sdk:lib> <sdk:name>com.google.android.maps</sdk:name> @@ -802,9 +802,9 @@ August 15, 2011 </sdk:libs> <sdk:archives> <sdk:archive arch="any" os="any"> - <sdk:size>147899839</sdk:size> - <sdk:checksum type="sha1">5c0c24f04e6b65c61da83408b7aee79228c24a40</sdk:checksum> - <sdk:url>google_apis-18_r01.zip</sdk:url> + <sdk:size>142778022</sdk:size> + <sdk:checksum type="sha1">40f2a6a6d6227dadd82cfe0f9783bd4c6bdb29c2</sdk:checksum> + <sdk:url>google_apis-18_r02.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -855,14 +855,14 @@ August 15, 2011 <sdk:vendor-display>Google Inc.</sdk:vendor-display> <sdk:name-display>Google Repository</sdk:name-display> <sdk:path>m2repository</sdk:path> - <sdk:revision>1</sdk:revision> + <sdk:revision>2</sdk:revision> <sdk:description>Local Maven repository for Google Libraries</sdk:description> <sdk:uses-license ref="android-sdk-license"/> <sdk:archives> <sdk:archive os="any"> - <sdk:size>660833</sdk:size> - <sdk:checksum type="sha1">d9a20d960f0d9a8de61a9ced5fc6c2c605f6c6c0</sdk:checksum> - <sdk:url>google_m2repository_r01.zip</sdk:url> + <sdk:size>2043649</sdk:size> + <sdk:checksum type="sha1">f518e0170e84a6bccbadb8a043989cc61f4c37aa</sdk:checksum> + <sdk:url>google_m2repository_r02.zip</sdk:url> </sdk:archive> </sdk:archives> </sdk:extra> @@ -910,15 +910,15 @@ August 15, 2011 <sdk:vendor-display>Google Inc.</sdk:vendor-display> <sdk:name-display>Google Play services</sdk:name-display> <sdk:path>google_play_services</sdk:path> - <sdk:revision>9</sdk:revision> + <sdk:revision>11</sdk:revision> <sdk:description>Google Play Services client library and sample code</sdk:description> <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url> <sdk:uses-license ref="android-sdk-license"/> <sdk:archives> <sdk:archive os="any"> - <sdk:size>5125755</sdk:size> - <sdk:checksum type="sha1">3e31fc0b982f938edf216afe9e532774db12607a</sdk:checksum> - <sdk:url>google_play_services_3159130_r09.zip</sdk:url> + <sdk:size>5265306</sdk:size> + <sdk:checksum type="sha1">00851350c55b016bef202700f643f246fb0c24ea</sdk:checksum> + <sdk:url>google_play_services_3264130_r11.zip</sdk:url> </sdk:archive> </sdk:archives> </sdk:extra> diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 651c84533f06..2fd66420cf6e 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -197,8 +197,8 @@ in 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"; + url = https://dl-ssl.google.com/android/repository/google_apis-18_r02.zip; + sha1 = "40f2a6a6d6227dadd82cfe0f9783bd4c6bdb29c2"; }; meta = { description = "Android + Google APIs"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 38377cf8bbb4..0b5f69ed3e2b 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -8,16 +8,16 @@ {platformVersions, abiVersions, useGoogleAPIs}: stdenv.mkDerivation { - name = "android-sdk-22.05"; + name = "android-sdk-22.2"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz; - md5 = "8201b10c21510f082c54f58a9bb082c8"; + url = http://dl.google.com/android/android-sdk_r22.2-linux.tgz; + md5 = "2a3776839e823ba9acb7a87a3fe26e02"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://dl.google.com/android/android-sdk_r22.0.5-macosx.zip; - md5 = "94f3cbe896c332b94ee0408ae610a4b8"; + url = http://dl.google.com/android/android-sdk_r22.2-macosx.zip; + md5 = "9dfef6404e2f842c433073796aed8b7d"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index 2ca937b5534e..5db90ffef1c0 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -209,8 +209,8 @@ in platform_18 = buildPlatform { name = "android-platform-4.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; - sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + url = https://dl-ssl.google.com/android/repository/android-18_r02.zip; + sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534"; }; 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 c89cb9ed1272..c5ddf714cdf6 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -209,8 +209,8 @@ in platform_18 = buildPlatform { name = "android-platform-4.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; - sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + url = https://dl-ssl.google.com/android/repository/android-18_r02.zip; + sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534"; }; meta = { description = "Android SDK Platform 4.3"; diff --git a/pkgs/development/mobile/androidenv/repository-8.xml b/pkgs/development/mobile/androidenv/repository-8.xml index 4e180ac4b3e6..79795aa49396 100644 --- a/pkgs/development/mobile/androidenv/repository-8.xml +++ b/pkgs/development/mobile/androidenv/repository-8.xml @@ -616,8 +616,8 @@ November 13, 2012 </sdk:platform> <sdk:platform> - <!-- Generated at Tue Jul 23 17:16:25 2013 from git_jb-mr2-release @ 737497 --> - <sdk:revision>1</sdk:revision> + <!-- Generated at Wed Sep 11 18:15:07 2013 from git_jb-mr2-dev @ 819563 --> + <sdk:revision>2</sdk:revision> <sdk:description>Android SDK Platform 4.3</sdk:description> <sdk:version>4.3</sdk:version> <sdk:api-level>18</sdk:api-level> @@ -625,14 +625,14 @@ November 13, 2012 <sdk:major>21</sdk:major> </sdk:min-tools-rev> <sdk:layoutlib> - <sdk:api>9</sdk:api> + <sdk:api>10</sdk:api> <sdk:revision>1</sdk:revision> </sdk:layoutlib> <sdk:archives> <sdk:archive arch="any" os="any"> - <sdk:size>48752456</sdk:size> - <sdk:checksum type="sha1">c24de91d6f296cf453701aef281609779fffb379</sdk:checksum> - <sdk:url>android-18_r01.zip</sdk:url> + <sdk:size>57319855</sdk:size> + <sdk:checksum type="sha1">62a9438d4cf6692f4d6510c27a380be195db9534</sdk:checksum> + <sdk:url>android-18_r02.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -705,16 +705,16 @@ November 13, 2012 </sdk:system-image> <sdk:system-image> - <!-- Generated at Tue Jul 23 17:18:11 2013 from git_jb-mr2-release @ 737497 --> - <sdk:revision>1</sdk:revision> + <!-- Generated at Mon Aug 12 12:43:28 2013 from git_jb-mr2-dev @ 774058 --> + <sdk:revision>2</sdk:revision> <sdk:description>Android SDK Platform 4.3</sdk:description> <sdk:api-level>18</sdk:api-level> <sdk:abi>armeabi-v7a</sdk:abi> <sdk:archives> <sdk:archive arch="any" os="any"> - <sdk:size>125597583</sdk:size> - <sdk:checksum type="sha1">5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e</sdk:checksum> - <sdk:url>sysimg_armv7a-18_r01.zip</sdk:url> + <sdk:size>125457135</sdk:size> + <sdk:checksum type="sha1">4a1a93200210d8c42793324362868846f67401ab</sdk:checksum> + <sdk:url>sysimg_armv7a-18_r02.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -1006,33 +1006,60 @@ November 13, 2012 <sdk:uses-license ref="android-sdk-license"/> </sdk:build-tool> + <sdk:build-tool> + <!-- Generated at Wed Sep 11 17:41:47 2013 from git_jb-mr2-dev @ 819563 --> + <sdk:revision> + <sdk:major>18</sdk:major> + <sdk:minor>1</sdk:minor> + <sdk:micro>0</sdk:micro> + </sdk:revision> + <sdk:archives> + <sdk:archive arch="any" os="windows"> + <sdk:size>19659547</sdk:size> + <sdk:checksum type="sha1">3a9810fc8559ab03c09378f07531e8cae2f1db30</sdk:checksum> + <sdk:url>build-tools_r18.1-windows.zip</sdk:url> + </sdk:archive> + <sdk:archive arch="any" os="linux"> + <sdk:size>20229298</sdk:size> + <sdk:checksum type="sha1">f314a0599e51397f0886fe888b50dd98f2f050d8</sdk:checksum> + <sdk:url>build-tools_r18.1-linux.zip</sdk:url> + </sdk:archive> + <sdk:archive arch="any" os="macosx"> + <sdk:size>20451524</sdk:size> + <sdk:checksum type="sha1">16ddb299b8b43063e5bb3387ec17147c5053dfd8</sdk:checksum> + <sdk:url>build-tools_r18.1-macosx.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </sdk:build-tool> + <!-- TOOLS ........................ --> <sdk:tool> - <!-- Generated at Mon Jul 29 16:02:44 2013 from git_tools_r22 @ 757759 --> + <!-- Generated at Wed Sep 11 18:24:51 2013 from git_mirror-aosp-tools_r22.2 @ 822324 --> <sdk:revision> <sdk:major>22</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>5</sdk:micro> + <sdk:minor>2</sdk:minor> + <sdk:micro>0</sdk:micro> </sdk:revision> <sdk:min-platform-tools-rev> <sdk:major>18</sdk:major> </sdk:min-platform-tools-rev> <sdk:archives> <sdk:archive arch="any" os="windows"> - <sdk:size>113389691</sdk:size> - <sdk:checksum type="sha1">a3f450706b5374122f0edb76a4488462ba5171ca</sdk:checksum> - <sdk:url>tools_r22.0.5-windows.zip</sdk:url> + <sdk:size>108669997</sdk:size> + <sdk:checksum type="sha1">c4231cd769ef9d1b6ae69202a1a0d0f783f04ea7</sdk:checksum> + <sdk:url>tools_r22.2-windows.zip</sdk:url> </sdk:archive> <sdk:archive arch="any" os="linux"> - <sdk:size>105904090</sdk:size> - <sdk:checksum type="sha1">06a3e1d66b9280cba49c7ba1893ea14beae072d2</sdk:checksum> - <sdk:url>tools_r22.0.5-linux.zip</sdk:url> + <sdk:size>101168674</sdk:size> + <sdk:checksum type="sha1">a11febd30023ed2590bca4c2d7b1dc2b0cfcd715</sdk:checksum> + <sdk:url>tools_r22.2-linux.zip</sdk:url> </sdk:archive> <sdk:archive arch="any" os="macosx"> - <sdk:size>77191184</sdk:size> - <sdk:checksum type="sha1">318947edef0ab46603eb7f4d21333ee4b4fa1ff3</sdk:checksum> - <sdk:url>tools_r22.0.5-macosx.zip</sdk:url> + <sdk:size>74822802</sdk:size> + <sdk:checksum type="sha1">76896171d0c9ba91c875c8f13ac58cd2e50e9f28</sdk:checksum> + <sdk:url>tools_r22.2-macosx.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> diff --git a/pkgs/development/mobile/androidenv/sys-img-x86.xml b/pkgs/development/mobile/androidenv/sys-img-x86.xml index f0e8347f6db4..75ddf73eb1d2 100644 --- a/pkgs/development/mobile/androidenv/sys-img-x86.xml +++ b/pkgs/development/mobile/androidenv/sys-img-x86.xml @@ -136,4 +136,19 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY </sdk:archives> </sdk:system-image> +<sdk:system-image> + <sdk:description>Android SDK Platform 4.3</sdk:description> + <sdk:revision>1</sdk:revision> + <sdk:api-level>18</sdk:api-level> + <sdk:abi>x86</sdk:abi> + <sdk:uses-license ref="intel-android-sysimage-license"/> + <sdk:archives> + <sdk:archive arch="any" os="any"> + <sdk:size>155656419</sdk:size> + <sdk:checksum type="sha1">f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1</sdk:checksum> + <sdk:url>sysimg_x86-18_r01.zip</sdk:url> + </sdk:archive> + </sdk:archives> +</sdk:system-image> + </sdk:sdk-sys-img> diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index bc78ea11e6f7..4c1f0a309075 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -48,8 +48,8 @@ in sysimg_armeabi-v7a_18 = buildSystemImage { name = "armeabi-v7a-18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r01.zip; - sha1 = "5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e"; + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r02.zip; + sha1 = "4a1a93200210d8c42793324362868846f67401ab"; }; }; @@ -85,6 +85,14 @@ in }; }; + sysimg_x86_18 = buildSystemImage { + name = "x86-18"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-18_r01.zip; + sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1"; + }; + }; + sysimg_mips_15 = buildSystemImage { name = "mips-15"; src = fetchurl { |