diff options
Diffstat (limited to 'pkgs/development/mobile/androidenv')
20 files changed, 864 insertions, 211 deletions
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 </sdk:add-on> <sdk:add-on> - <!-- Generated at Mon Nov 12 17:15:51 2012 from git_jb-mr1-dev @ 526865 --> + <sdk:vendor-id>google</sdk:vendor-id> + <sdk:vendor-display>Google Inc.</sdk:vendor-display> + <sdk:name-id>google_tv_addon</sdk:name-id> + <sdk:name-display>Google TV Addon</sdk:name-display> + <sdk:api-level>13</sdk:api-level> + <sdk:revision>1</sdk:revision> + <sdk:description>Android + Google TV, API 13</sdk:description> + <sdk:desc-url>http://developer.android.com/</sdk:desc-url> + <sdk:uses-license ref="android-googletv-license"/> + <sdk:archives> + <sdk:archive os="any"> + <sdk:size>87721879</sdk:size> + <sdk:checksum type="sha1">b73f7c66011ac8180b44aa4e83b8d78c66ea9a09</sdk:checksum> + <sdk:url>google_tv-13_r01.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:libs/> + </sdk:add-on> + + <sdk:add-on> + <!-- Generated at Tue May 14 08:07:47 2013 from git_jb-mr1.1-dev @ 673949 --> <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>17</sdk:api-level> + <sdk:revision>3</sdk:revision> + <sdk:libs> + <sdk:lib> + <sdk:name>com.google.android.maps</sdk:name> + </sdk:lib> + <sdk:lib> + <sdk:name>com.android.future.usb.accessory</sdk:name> + </sdk:lib> + <sdk:lib> + <sdk:name>com.google.android.media.effects</sdk:name> + </sdk:lib> + </sdk:libs> + <sdk:archives> + <sdk:archive arch="any" os="any"> + <sdk:size>137156978</sdk:size> + <sdk:checksum type="sha1">8246f61d24f0408c8e7bc352a1e522b7e2b619ba</sdk:checksum> + <sdk:url>google_apis-17_r03.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </sdk:add-on> + + <sdk:add-on> + <!-- Generated at Tue Jul 23 17:14:07 2013 from git_jb-mr2-release @ 737497 --> + <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:libs> <sdk:lib> @@ -752,9 +802,9 @@ August 15, 2011 </sdk:libs> <sdk:archives> <sdk:archive arch="any" os="any"> - <sdk:size>132568033</sdk:size> - <sdk:checksum type="sha1">62cb086f11e15713878c8834d58ef1a2454c19a4</sdk:checksum> - <sdk:url>google_apis-17_r01.zip</sdk:url> + <sdk:size>147899839</sdk:size> + <sdk:checksum type="sha1">5c0c24f04e6b65c61da83408b7aee79228c24a40</sdk:checksum> + <sdk:url>google_apis-18_r01.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -763,8 +813,8 @@ August 15, 2011 <!-- EXTRAS VENDOR=ANDROID ........................ --> <sdk:extra> - <!-- Generated at Mon Nov 12 17:16:25 2012 from git_jb-mr1-dev @ 526865 --> - <sdk:revision>11</sdk:revision> + <!-- Generated at Tue Jul 23 17:18:50 2013 from git_jb-mr2-ub-dev @ 751786 --> + <sdk:revision>18</sdk:revision> <sdk:vendor-display>Android</sdk:vendor-display> <sdk:vendor-id>android</sdk:vendor-id> <sdk:name-display>Android Support Library</sdk:name-display> @@ -772,9 +822,27 @@ August 15, 2011 <sdk:old-paths>compatibility</sdk:old-paths> <sdk:archives> <sdk:archive arch="any" os="any"> - <sdk:size>1264808</sdk:size> - <sdk:checksum type="sha1">d30d182d8e4c86bb4464c03a83ccffce7bc84ecd</sdk:checksum> - <sdk:url>support_r11.zip</sdk:url> + <sdk:size>4438319</sdk:size> + <sdk:checksum type="sha1">bd67b4b8a6bac629f24c8aea75c3619a26d9a568</sdk:checksum> + <sdk:url>support_r18.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </sdk:extra> + + <sdk:extra> + <!-- Generated from git_jb-mr2-ub-dev @ 751786 --> + <sdk:revision>2</sdk:revision> + <sdk:vendor-display>Android</sdk:vendor-display> + <sdk:vendor-id>android</sdk:vendor-id> + <sdk:name-display>Android Support Repository</sdk:name-display> + <sdk:description>Local Maven repository for Support Libraries</sdk:description> + <sdk:path>m2repository</sdk:path> + <sdk:archives> + <sdk:archive arch="any" os="any"> + <sdk:size>3705797</sdk:size> + <sdk:checksum type="sha1">c4284e4bf17a1e8bafc96a18de36984022d5a46a</sdk:checksum> + <sdk:url>android_m2repository_r02.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -785,6 +853,23 @@ August 15, 2011 <sdk:extra> <sdk:vendor-id>google</sdk:vendor-id> <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: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:archive> + </sdk:archives> + </sdk:extra> + + <sdk:extra> + <sdk:vendor-id>google</sdk:vendor-id> + <sdk:vendor-display>Google Inc.</sdk:vendor-display> <sdk:name-display>Google Play Licensing Library</sdk:name-display> <sdk:path>play_licensing</sdk:path> <sdk:old-paths>market_licensing</sdk:old-paths> @@ -807,14 +892,14 @@ August 15, 2011 <sdk:name-display>Google Play APK Expansion Library</sdk:name-display> <sdk:path>play_apk_expansion</sdk:path> <sdk:old-paths>market_apk_expansion</sdk:old-paths> - <sdk:revision>2</sdk:revision> + <sdk:revision>3</sdk:revision> <sdk:description>Google Play APK Expansion library</sdk:description> <sdk:desc-url>http://developer.android.com/guide/market/expansion-files.html</sdk:desc-url> <sdk:archives> <sdk:archive os="any"> - <sdk:size>111636</sdk:size> - <sdk:checksum type="sha1">47fa8c691fcc8cf815e7ebbf140f12e94495f73b</sdk:checksum> - <sdk:url>market_apk_expansion-r02.zip</sdk:url> + <sdk:size>110201</sdk:size> + <sdk:checksum type="sha1">5305399dc1a56814e86b8459ce24871916f78b8c</sdk:checksum> + <sdk:url>market_apk_expansion-r03.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -825,34 +910,34 @@ 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>4</sdk:revision> + <sdk:revision>9</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>3732458</sdk:size> - <sdk:checksum type="sha1">bbb3d11225fcf60a0bae75afa2c4737010468bf6</sdk:checksum> - <sdk:url>google_play_services_2012110_r04.zip</sdk:url> + <sdk:size>5125755</sdk:size> + <sdk:checksum type="sha1">3e31fc0b982f938edf216afe9e532774db12607a</sdk:checksum> + <sdk:url>google_play_services_3159130_r09.zip</sdk:url> </sdk:archive> </sdk:archives> </sdk:extra> <sdk:extra> - <!-- Generated at Tue Aug 28 11:07:05 2012 from git_master @ 449897 --> + <!-- Generated at Thu Jul 18 16:46:04 PDT 2013 from git_master @ 745409 --> <sdk:vendor-id>google</sdk:vendor-id> <sdk:vendor-display>Google Inc.</sdk:vendor-display> <sdk:name-display>Google USB Driver</sdk:name-display> <sdk:path>usb_driver</sdk:path> - <sdk:revision>7</sdk:revision> - <sdk:description>USB Driver for Windows, revision 7</sdk:description> + <sdk:revision>8</sdk:revision> + <sdk:description>USB Driver for Windows, revision 8</sdk:description> <sdk:desc-url>http://developer.android.com/</sdk:desc-url> <sdk:uses-license ref="android-sdk-license"/> <sdk:archives> <sdk:archive os="windows"> - <sdk:size>8681704</sdk:size> - <sdk:checksum type="sha1">147c339fde22f98ae41b15349a8303d39a2cf6e5</sdk:checksum> - <sdk:url>usb_driver_r07-windows.zip</sdk:url> + <sdk:size>8682230</sdk:size> + <sdk:checksum type="sha1">2b2f91098a984a865a70f0bd841a843fb54462fc</sdk:checksum> + <sdk:url>usb_driver_r08-windows.zip</sdk:url> </sdk:archive> </sdk:archives> </sdk:extra> @@ -863,14 +948,14 @@ August 15, 2011 <sdk:name-display>Google Play Billing Library</sdk:name-display> <sdk:path>play_billing</sdk:path> <sdk:old-paths>market_billing</sdk:old-paths> - <sdk:revision>3</sdk:revision> + <sdk:revision>4</sdk:revision> <sdk:description>Google Play Billing files and sample code</sdk:description> <sdk:desc-url>http://developer.android.com/google/play/billing/index.html</sdk:desc-url> <sdk:archives> <sdk:archive os="any"> - <sdk:size>435718</sdk:size> - <sdk:checksum type="sha1">a133d454c992ef2a18e62fa810e8185f1be4b054</sdk:checksum> - <sdk:url>play_billing_r03.zip</sdk:url> + <sdk:size>437084</sdk:size> + <sdk:checksum type="sha1">38fdae51dadb6d1e63e177adba3e4d96b751686e</sdk:checksum> + <sdk:url>play_billing_r04.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -881,14 +966,14 @@ August 15, 2011 <sdk:vendor-display>Google Inc.</sdk:vendor-display> <sdk:name-display>Google AdMob Ads SDK</sdk:name-display> <sdk:path>admob_ads_sdk</sdk:path> - <sdk:revision>8</sdk:revision> + <sdk:revision>11</sdk:revision> <sdk:description>AdMob Ads SDK</sdk:description> <sdk:desc-url>https://developers.google.com/mobile-ads-sdk/docs/</sdk:desc-url> <sdk:archives> <sdk:archive os="any"> - <sdk:size>545547</sdk:size> - <sdk:checksum type="sha1">031476aa5a491239d2624e8de8c9e46e40d93e3f</sdk:checksum> - <sdk:url>https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.2.1.zip</sdk:url> + <sdk:size>704512</sdk:size> + <sdk:checksum type="sha1">0102859d9575baa0bf4fd5eb422af2ad0fe6cb82</sdk:checksum> + <sdk:url>https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.4.1.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -897,16 +982,16 @@ August 15, 2011 <sdk:extra> <sdk:vendor-id>google</sdk:vendor-id> <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-display>Google Analytics SDK</sdk:name-display> - <sdk:path>analytics_sdk</sdk:path> - <sdk:revision>2</sdk:revision> - <sdk:description>Analytics SDK</sdk:description> - <sdk:desc-url>http://code.google.com/mobile/analytics/</sdk:desc-url> + <sdk:name-display>Google Analytics App Tracking SDK</sdk:name-display> + <sdk:path>analytics_sdk_v2</sdk:path> + <sdk:revision>3</sdk:revision> + <sdk:description>Analytics App Tracking SDK</sdk:description> + <sdk:desc-url>http://developers.google.com/analytics/devguides/collection/</sdk:desc-url> <sdk:archives> <sdk:archive os="any"> - <sdk:size>53055</sdk:size> - <sdk:checksum type="sha1">328bcdc6c241879ebb04d6edc6fec1052a171004</sdk:checksum> - <sdk:url>https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_1.4.2.zip</sdk:url> + <sdk:size>211432</sdk:size> + <sdk:checksum type="sha1">dc14026bf0ce78315cb5dd00552607de0894de83</sdk:checksum> + <sdk:url>https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_2.0beta5.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -933,10 +1018,10 @@ August 15, 2011 <sdk:extra> <sdk:vendor-id>google</sdk:vendor-id> <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-display>Google Cloud Messaging for Android Library</sdk:name-display> + <sdk:name-display>[Deprecated] Google Cloud Messaging for Android Library</sdk:name-display> <sdk:path>gcm</sdk:path> <sdk:revision>3</sdk:revision> - <sdk:description>Google Cloud Messaging for Android library and sample code</sdk:description> + <sdk:description>GCM library has been moved to Google Play Services (com.google.android.gms.gcm) and this standalone version is no longer supported</sdk:description> <sdk:desc-url>https://developers.google.com/android/gcm/index</sdk:desc-url> <sdk:archives> <sdk:archive os="any"> 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..1573de63e096 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}: +{platformVersions, abiVersions, 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 + --suffix 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 + --suffix 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 @@ -147,19 +148,21 @@ stdenv.mkDerivation { mkdir -p system-images cd system-images - ${stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("sysimg_"+platformVersion) sysimages) then - let - sysimg = builtins.getAttr ("sysimg_"+platformVersion) sysimages; - in - '' - mkdir -p android-${platformVersion} - cd android-${platformVersion} - ln -s ${sysimg}/* - cd .. - '' - else "" - ) platformVersions} + ${stdenv.lib.concatMapStrings (abiVersion: + stdenv.lib.concatMapStrings (platformVersion: + if (builtins.hasAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages) then + let + sysimg = builtins.getAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages; + in + '' + mkdir -p android-${platformVersion} + cd android-${platformVersion} + ln -s ${sysimg}/* + cd .. + '' + else "" + ) platformVersions + ) abiVersions} # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 8b770ede0fc7..2792d364f15c 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -1,5 +1,5 @@ { stdenv, androidsdk, jdk, ant }: -{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false +{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null }: @@ -10,7 +10,10 @@ let else if stdenv.system == "x86_64-darwin" then "macosx" else throw "Platform: ${stdenv.system} is not supported!"; - androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; }; + androidsdkComposition = androidsdk { + inherit platformVersions useGoogleAPIs; + abiVersions = []; + }; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; @@ -32,7 +35,7 @@ stdenv.mkDerivation { ''} export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it. - ant ${if release then "release" else "debug"} + ant ${antFlags} ${if release then "release" else "debug"} ''; installPhase = '' 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..6e410d4c5db9 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,10 +48,18 @@ 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 { platformVersions = [ "16" ]; + abiVersions = [ "armeabi-v7a" ]; + useGoogleAPIs = true; + }; + + androidsdk_4_2 = androidsdk { + platformVersions = [ "17" ]; + abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 3cbe57238066..eb39d854d1fb 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,8 +1,12 @@ {stdenv, androidsdk}: -{name, app, platformVersion ? "8", useGoogleAPIs ? false, package, activity}: +{name, app, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false, enableGPU ? false, package, activity}: let - androidsdkComposition = androidsdk { inherit useGoogleAPIs; platformVersions = [ platformVersion ]; }; + androidsdkComposition = androidsdk { + inherit useGoogleAPIs; + platformVersions = [ platformVersion ]; + abiVersions = [ abiVersion ]; + }; in stdenv.mkDerivation { inherit name; @@ -46,7 +50,12 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" # Create a virtual android device - ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} + yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} + + # Enable GPU acceleration + ${stdenv.lib.optionalString enableGPU '' + echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini + ''} # Launch the emulator ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port & 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 @@ <?xml version="1.0"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:sdk="http://schemas.android.com/sdk/android/repository/7"> + xmlns:sdk="http://schemas.android.com/sdk/android/repository/8"> <xsl:param name="os" /> <xsl:output omit-xml-declaration="yes" indent="no" /> diff --git a/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl b/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl new file mode 100644 index 000000000000..31ab72add364 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl @@ -0,0 +1,21 @@ +<?xml version="1.0"?> + +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:str="http://exslt.org/strings" + xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <xsl:param name="abi" /> + <xsl:output omit-xml-declaration="yes" indent="no" /> + + <xsl:template match="/sdk:sdk-sys-img"> + <xsl:for-each select="sdk:system-image"> + sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage { + name = "<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/<xsl:value-of select="$abi" />/<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:url" />; + sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:checksum[@type='sha1']" />"; + }; + }; + </xsl:for-each> + </xsl:template> +</xsl:stylesheet> diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh index dc28c27f45f0..90b1e04c2297 100755 --- a/pkgs/development/mobile/androidenv/generate-sysimages.sh +++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh @@ -1,3 +1,26 @@ #!/bin/sh -e -xsltproc generate-sysimages.xsl repository-7.xml > sysimages.nix +cat > sysimages.nix << "EOF" +{stdenv, fetchurl, unzip}: + +let + buildSystemImage = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ +EOF + +xsltproc generate-sysimages.xsl repository-8.xml >> sysimages.nix +xsltproc --stringparam abi x86 generate-sysimages-others.xsl sys-img-x86.xml >> sysimages.nix +xsltproc --stringparam abi mips generate-sysimages-others.xsl sys-img-mips.xml >> sysimages.nix + +cat >> sysimages.nix << "EOF" +} +EOF diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl index 1224ebbd4e8d..be9947d536a9 100644 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl @@ -2,27 +2,13 @@ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:str="http://exslt.org/strings" - xmlns:sdk="http://schemas.android.com/sdk/android/repository/7"> + xmlns:sdk="http://schemas.android.com/sdk/android/repository/8"> <xsl:output omit-xml-declaration="yes" indent="no" /> <xsl:template match="/sdk:sdk-repository"> -{stdenv, fetchurl, unzip}: - -let - buildSystemImage = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ <xsl:for-each select="sdk:system-image"> - sysimg_<xsl:value-of select="sdk:api-level" /> = buildSystemImage { + sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage { name = "<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:url" />; @@ -30,7 +16,5 @@ in }; }; </xsl:for-each> -} </xsl:template> - </xsl:stylesheet> diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 554996082909..bf263741bddd 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 = "126325cbb55928c38acbb9c7bb5d9145d94fad56"; } 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 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. --> -<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <sdk:license id="android-sdk-license" type="text">Terms and Conditions @@ -570,33 +570,33 @@ November 13, 2012 </sdk:platform> <sdk:platform> - <!-- Generated at Tue Oct 9 13:42:01 2012 from git_jb-dev @ 495790 --> - <sdk:revision>3</sdk:revision> - <sdk:description>Android SDK Platform 4.1</sdk:description> + <!-- Generated at Thu Dec 6 10:54:05 2012 from git_jb-dev @ 543062 --> + <sdk:revision>4</sdk:revision> + <sdk:description>Android SDK Platform 4.1.2</sdk:description> <sdk:version>4.1.2</sdk:version> <sdk:api-level>16</sdk:api-level> <sdk:min-tools-rev> - <sdk:major>20</sdk:major> + <sdk:major>21</sdk:major> </sdk:min-tools-rev> <sdk:layoutlib> - <sdk:api>8</sdk:api> + <sdk:api>9</sdk:api> <sdk:revision>1</sdk:revision> </sdk:layoutlib> <sdk:archives> <sdk:archive arch="any" os="any"> - <sdk:size>47995505</sdk:size> - <sdk:checksum type="sha1">80d9ffef58168f9bccd862830e2ee51f686b167e</sdk:checksum> - <sdk:url>android-16_r03.zip</sdk:url> + <sdk:size>48005140</sdk:size> + <sdk:checksum type="sha1">90b9157b8b45f966be97e11a22fba4591b96c2ee</sdk:checksum> + <sdk:url>android-16_r04.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> </sdk:platform> <sdk:platform> - <!-- Generated at Mon Nov 12 17:12:35 2012 from git_jb-mr1-dev @ 526865 --> - <sdk:revision>1</sdk:revision> - <sdk:description>Android SDK Platform 4.2</sdk:description> - <sdk:version>4.2</sdk:version> + <!-- Generated at Wed Feb 13 11:27:09 2013 from git_jb-mr1.1-dev @ 576024 --> + <sdk:revision>2</sdk:revision> + <sdk:description>Android SDK Platform 4.2.2</sdk:description> + <sdk:version>4.2.2</sdk:version> <sdk:api-level>17</sdk:api-level> <sdk:min-tools-rev> <sdk:major>21</sdk:major> @@ -607,9 +607,32 @@ November 13, 2012 </sdk:layoutlib> <sdk:archives> <sdk:archive arch="any" os="any"> - <sdk:size>47886130</sdk:size> - <sdk:checksum type="sha1">c2e7c8c8db40e06b804ddb1725ac2c3555b55025</sdk:checksum> - <sdk:url>android-17_r01.zip</sdk:url> + <sdk:size>48057484</sdk:size> + <sdk:checksum type="sha1">c442c32c1b702173ab0929a74486e4f86fe528ec</sdk:checksum> + <sdk:url>android-17_r02.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </sdk:platform> + + <sdk:platform> + <!-- Generated at Tue Jul 23 17:16:25 2013 from git_jb-mr2-release @ 737497 --> + <sdk:revision>1</sdk:revision> + <sdk:description>Android SDK Platform 4.3</sdk:description> + <sdk:version>4.3</sdk:version> + <sdk:api-level>18</sdk:api-level> + <sdk:min-tools-rev> + <sdk:major>21</sdk:major> + </sdk:min-tools-rev> + <sdk:layoutlib> + <sdk:api>9</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:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -666,16 +689,32 @@ November 13, 2012 </sdk:system-image> <sdk:system-image> - <!-- Generated at Mon Nov 12 17:14:39 2012 from git_jb-mr1-dev @ 526865 --> - <sdk:revision>1</sdk:revision> - <sdk:description>Android SDK Platform 4.2</sdk:description> + <!-- Generated at Wed Feb 13 11:29:12 2013 from git_jb-mr1.1-dev @ 576024 --> + <sdk:revision>2</sdk:revision> + <sdk:description>Android SDK Platform 4.2.2</sdk:description> <sdk:api-level>17</sdk:api-level> <sdk:abi>armeabi-v7a</sdk:abi> <sdk:archives> <sdk:archive arch="any" os="any"> - <sdk:size>116831648</sdk:size> - <sdk:checksum type="sha1">45b9344473e0a6d063c2b1fe58d8cd47d307905e</sdk:checksum> - <sdk:url>sysimg_armv7a-17_r01.zip</sdk:url> + <sdk:size>116553808</sdk:size> + <sdk:checksum type="sha1">1c321cda1af793b84d47d1a8d15f85444d265e3c</sdk:checksum> + <sdk:url>sysimg_armv7a-17_r02.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </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> + <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:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -866,89 +905,134 @@ November 13, 2012 <sdk:uses-license ref="android-sdk-license"/> </sdk:sample> + <sdk:sample> + <!-- Generated at Tue Jul 23 17:17:22 2013 from git_jb-mr2-ub-dev @ 751786 --> + <sdk:revision>1</sdk:revision> + <sdk:api-level>18</sdk:api-level> + <sdk:archives> + <sdk:archive arch="any" os="any"> + <sdk:size>19897793</sdk:size> + <sdk:checksum type="sha1">73e879ce46c04a6e63ad1a9107018b4782945007</sdk:checksum> + <sdk:url>samples-18_r01.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </sdk:sample> + <!-- PLATFORM-TOOLS ........................ --> <sdk:platform-tool> - <!-- Generated at Mon Nov 12 17:13:48 2012 from git_jb-mr1-dev @ 527242 --> + <!-- Generated at Mon Jul 29 15:56:24 2013 from git_jb-mr2-dev @ 754669 --> <sdk:revision> - <sdk:major>16</sdk:major> + <sdk:major>18</sdk:major> + <sdk:minor>0</sdk:minor> + <sdk:micro>1</sdk:micro> </sdk:revision> <sdk:archives> <sdk:archive arch="any" os="windows"> - <sdk:size>11938435</sdk:size> - <sdk:checksum type="sha1">0d6245b685c7d303cf4a054a3d373c4427b7ad01</sdk:checksum> - <sdk:url>platform-tools_r16-windows.zip</sdk:url> + <sdk:size>954769</sdk:size> + <sdk:checksum type="sha1">b40fea3ed72296dd42dd616a7abf536b8dace20d</sdk:checksum> + <sdk:url>platform-tools_r18.0.1-windows.zip</sdk:url> </sdk:archive> <sdk:archive arch="any" os="linux"> - <sdk:size>12676089</sdk:size> - <sdk:checksum type="sha1">84d563ae5e324f223f335f11bf511bf6207c05fb</sdk:checksum> - <sdk:url>platform-tools_r16-linux.zip</sdk:url> + <sdk:size>1011194</sdk:size> + <sdk:checksum type="sha1">cf9bdbbaa34da37b59724f914dad907c2c74a387</sdk:checksum> + <sdk:url>platform-tools_r18.0.1-linux.zip</sdk:url> </sdk:archive> <sdk:archive arch="any" os="macosx"> - <sdk:size>13147351</sdk:size> - <sdk:checksum type="sha1">fbb0f8d2786a83b8c3eb6df402e706e136db8fed</sdk:checksum> - <sdk:url>platform-tools_r16-macosx.zip</sdk:url> + <sdk:size>971087</sdk:size> + <sdk:checksum type="sha1">126325cbb55928c38acbb9c7bb5d9145d94fad56</sdk:checksum> + <sdk:url>platform-tools_r18.0.1-macosx.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> </sdk:platform-tool> - <!-- TOOLS ........................ --> + <!-- BUILD-TOOLS ........................ --> - <sdk:tool> - <!-- Generated at Mon Nov 12 17:07:47 2012 from git_tools_r21 @ 519525 --> + <sdk:build-tool> + <!-- Generated at Tue May 14 16:40:25 2013 from git_jb-mr1.1-dev @ 673949 --> <sdk:revision> - <sdk:major>21</sdk:major> + <sdk:major>17</sdk:major> + <sdk:minor>0</sdk:minor> + <sdk:micro>0</sdk:micro> </sdk:revision> - <sdk:min-platform-tools-rev> - <sdk:major>16</sdk:major> - </sdk:min-platform-tools-rev> <sdk:archives> <sdk:archive arch="any" os="windows"> - <sdk:size>98982670</sdk:size> - <sdk:checksum type="sha1">57bbfadcedbef44fc322e5e037666393668cf3fe</sdk:checksum> - <sdk:url>tools_r21-windows.zip</sdk:url> + <sdk:size>11004914</sdk:size> + <sdk:checksum type="sha1">899897d327b0bad492d3a40d3db4d96119c15bc0</sdk:checksum> + <sdk:url>build-tools_r17-windows.zip</sdk:url> </sdk:archive> <sdk:archive arch="any" os="linux"> - <sdk:size>91495104</sdk:size> - <sdk:checksum type="sha1">013b9c04407a9d73b8bf3c574327fbe870acd264</sdk:checksum> - <sdk:url>tools_r21-linux.zip</sdk:url> + <sdk:size>11696007</sdk:size> + <sdk:checksum type="sha1">2c2872bc3806aabf16a12e3959c2183ddc866e6d</sdk:checksum> + <sdk:url>build-tools_r17-linux.zip</sdk:url> </sdk:archive> <sdk:archive arch="any" os="macosx"> - <sdk:size>65767130</sdk:size> - <sdk:checksum type="sha1">fcfa3a6932f2ed0d970a0ca959bb2b4972f7d46d</sdk:checksum> - <sdk:url>tools_r21-macosx.zip</sdk:url> + <sdk:size>12208114</sdk:size> + <sdk:checksum type="sha1">602ee709be9dbb8f179b1e4075148a57f9419930</sdk:checksum> + <sdk:url>build-tools_r17-macosx.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> - </sdk:tool> + </sdk:build-tool> - <sdk:tool> - <!-- Generated at Fri Nov 30 13:45:55 2012 from git_tools_r21 @ 539280 --> + <!-- Build tools version 18.0.0 was broken for renderscript, so it has been removed --> + + <sdk:build-tool> + <!-- Generated at Mon Jul 29 15:14:00 2013 from git_jb-mr2-dev @ 754669 --> <sdk:revision> - <sdk:major>21</sdk:major> + <sdk:major>18</sdk:major> <sdk:minor>0</sdk:minor> <sdk:micro>1</sdk:micro> - <sdk:preview>1</sdk:preview> + </sdk:revision> + <sdk:archives> + <sdk:archive arch="any" os="windows"> + <sdk:size>15413527</sdk:size> + <sdk:checksum type="sha1">a6c2afd0b6289d589351956d2f5212b37014ca7d</sdk:checksum> + <sdk:url>build-tools_r18.0.1-windows.zip</sdk:url> + </sdk:archive> + <sdk:archive arch="any" os="linux"> + <sdk:size>16627330</sdk:size> + <sdk:checksum type="sha1">f11618492b0d2270c332325d45d752d3656a9640</sdk:checksum> + <sdk:url>build-tools_r18.0.1-linux.zip</sdk:url> + </sdk:archive> + <sdk:archive arch="any" os="macosx"> + <sdk:size>16633121</sdk:size> + <sdk:checksum type="sha1">d84f5692fb44d60fc53e5b2507cebf9f24626902</sdk:checksum> + <sdk:url>build-tools_r18.0.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 --> + <sdk:revision> + <sdk:major>22</sdk:major> + <sdk:minor>0</sdk:minor> + <sdk:micro>5</sdk:micro> </sdk:revision> <sdk:min-platform-tools-rev> - <sdk:major>16</sdk:major> + <sdk:major>18</sdk:major> </sdk:min-platform-tools-rev> <sdk:archives> <sdk:archive arch="any" os="windows"> - <sdk:size>98998088</sdk:size> - <sdk:checksum type="sha1">1503aaf2c91cb07c0240a2db3af0de027941a4f6</sdk:checksum> - <sdk:url>tools_r21.0.1_rc1-windows.zip</sdk:url> + <sdk:size>113389691</sdk:size> + <sdk:checksum type="sha1">a3f450706b5374122f0edb76a4488462ba5171ca</sdk:checksum> + <sdk:url>tools_r22.0.5-windows.zip</sdk:url> </sdk:archive> <sdk:archive arch="any" os="linux"> - <sdk:size>91510079</sdk:size> - <sdk:checksum type="sha1">183670a7f9878d8d3693d5fcf32e1357b69f0fed</sdk:checksum> - <sdk:url>tools_r21.0.1_rc1-linux.zip</sdk:url> + <sdk:size>105904090</sdk:size> + <sdk:checksum type="sha1">06a3e1d66b9280cba49c7ba1893ea14beae072d2</sdk:checksum> + <sdk:url>tools_r22.0.5-linux.zip</sdk:url> </sdk:archive> <sdk:archive arch="any" os="macosx"> - <sdk:size>65777178</sdk:size> - <sdk:checksum type="sha1">109d4f287904875f067e021be3fd1f549e6afb67</sdk:checksum> - <sdk:url>tools_r21.0.1_rc1-macosx.zip</sdk:url> + <sdk:size>77191184</sdk:size> + <sdk:checksum type="sha1">318947edef0ab46603eb7f4d21333ee4b4fa1ff3</sdk:checksum> + <sdk:url>tools_r22.0.5-macosx.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -957,14 +1041,14 @@ November 13, 2012 <!-- DOCS ........................ --> <sdk:doc> - <!-- Generated at Mon Nov 12 17:17:53 2012 from git_jb-mr1-dev @ 528390 --> + <!-- Generated at Tue Jul 23 17:15:55 2013 from git_jb-mr2-release @ 737497 --> <sdk:revision>1</sdk:revision> - <sdk:api-level>17</sdk:api-level> + <sdk:api-level>18</sdk:api-level> <sdk:archives> <sdk:archive arch="any" os="any"> - <sdk:size>171564393</sdk:size> - <sdk:checksum type="sha1">fb988cdd2beaac0dd47dc630821ccc30557c67e5</sdk:checksum> - <sdk:url>docs-17_r01.zip</sdk:url> + <sdk:size>142332266</sdk:size> + <sdk:checksum type="sha1">83632d157781d31f2a8e52acad5c4c5d0f307cba</sdk:checksum> + <sdk:url>docs-18_r01.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -1027,4 +1111,18 @@ November 13, 2012 </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> </sdk:source> + + <sdk:source> + <!-- Generated at Tue Jul 23 17:18:30 2013 from git_jb-mr2-release @ 737497 --> + <sdk:revision>1</sdk:revision> + <sdk:api-level>18</sdk:api-level> + <sdk:archives> + <sdk:archive arch="any" os="any"> + <sdk:size>20226735</sdk:size> + <sdk:checksum type="sha1">8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78</sdk:checksum> + <sdk:url>sources-18_r01.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </sdk:source> </sdk:sdk-repository> 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/sys-img-mips.xml b/pkgs/development/mobile/androidenv/sys-img-mips.xml new file mode 100644 index 000000000000..c839d283f4ea --- /dev/null +++ b/pkgs/development/mobile/androidenv/sys-img-mips.xml @@ -0,0 +1,132 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +--> +<sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <sdk:license id="mips-android-sysimage-license" type="text"> + <![CDATA[ +MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK): +This Internal Evaluation License Agreement (this "Agreement") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below. + +By clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials. + +1. DEFINITIONS. These terms shall have the following meanings: + +1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085 + +1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient. + +1.3 “Evaluation Materials" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient. + +1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL). + +1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers. + +2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials. + +THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE. + +3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement. + +4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form. + + +EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN. + +5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it. + +6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source. + +7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND. + +8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS. + +9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient. + +10. GENERAL. + +10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts. + +10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach. + +10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion. + +10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS. + +10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions. + +10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located. + +10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person. + +ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND. + +10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. + ]]> + </sdk:license> + + <sdk:system-image> + <sdk:revision>1</sdk:revision> + <sdk:description>Android 4.0.4</sdk:description> + <sdk:api-level>15</sdk:api-level> + <sdk:abi>mips</sdk:abi> + <sdk:uses-license ref="mips-android-sysimage-license"/> + <sdk:archives> + <sdk:archive os="any"> + <sdk:size>117503178</sdk:size> + <sdk:checksum type="sha1">a753bb4a6783124dad726c500ce9aec9d2c1b2d9</sdk:checksum> + <sdk:url>sysimg_mips-15_r01.zip</sdk:url> + </sdk:archive> + </sdk:archives> + </sdk:system-image> + + <sdk:system-image> + <sdk:revision>4</sdk:revision> + <!-- mipsia repo tag qa-dev-mips-jb-20130123, + github.com/MIPS branch dev-mips-jb, tag mips-jb-4.1.2_r1m1 + repo init -u git://github.com/MIPS/manifests.git + -b dev-mips-jb -m mips-jb-4.1.2_r1m1.xml --> + <sdk:description>Android 4.1.2</sdk:description> + <sdk:api-level>16</sdk:api-level> + <sdk:abi>mips</sdk:abi> + <sdk:uses-license ref="mips-android-sysimage-license"/> + <sdk:archives> + <sdk:archive os="any"> + <sdk:size>122482530</sdk:size> + <sdk:checksum type="sha1">67943c54fb3943943ffeb05fdd39c0b753681f6e</sdk:checksum> + <sdk:url>sysimg_mips-16_r04.zip</sdk:url> + </sdk:archive> + </sdk:archives> + </sdk:system-image> + + <sdk:system-image> + <sdk:revision>1</sdk:revision> + <!-- mipsia repo tag qa-dev-mips-jb-mr1-20121219, + github.com/MIPS tag mips-jb-4.2.1_r1 --> + <sdk:description>Android 4.2.1</sdk:description> + <sdk:api-level>17</sdk:api-level> + <sdk:abi>mips</sdk:abi> + <sdk:uses-license ref="mips-android-sysimage-license"/> + <sdk:archives> + <sdk:archive os="any"> + <sdk:size>131781761</sdk:size> + <sdk:checksum type="sha1">f0c6e153bd584c29e51b5c9723cfbf30f996a05d</sdk:checksum> + <sdk:url>sysimg_mips-17_r01.zip</sdk:url> + </sdk:archive> + </sdk:archives> + </sdk:system-image> + +</sdk:sdk-sys-img> diff --git a/pkgs/development/mobile/androidenv/sys-img-x86.xml b/pkgs/development/mobile/androidenv/sys-img-x86.xml new file mode 100644 index 000000000000..f0e8347f6db4 --- /dev/null +++ b/pkgs/development/mobile/androidenv/sys-img-x86.xml @@ -0,0 +1,139 @@ +<!-- +* Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. +--> +<sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + +<sdk:license id="intel-android-sysimage-license" type="text"> +<![CDATA[ +Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK) +This Internal Evaluation License Agreement (this "Agreement") is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions. + +Definitions. +These terms shall have the following meanings: + +"Intel" or "INTEL" +Intel Corporation +With an Address of: +2200 Mission College Blvd. +Santa Clara, CA 95052 +Office of the General Counsel +Mail Stop: RNB-4-51 +Attn: Software and Services Group Legal + +"Evaluation Software" +The x86 Android* emulator system images for Android Software Development Kit (SDK), as provided by Intel. + +INTERNAL EVALUATION LICENSE TERMS AND CONDITIONS + +1. DEFINITIONS. + +1.1 Additional Defined Terms. "Agreement", "Evaluation Software", "Intel", "Non-disclosure Agreement", "Recipient", and "Effective Date" shall have the meanings ascribed to them on the signature page(s) of this Agreement. + +1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software. + +1.3 "Open Source Software" means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNUs General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL). + +1.4 "Pre-Release Materials" means "alpha" or "beta" designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intels suppliers. + +2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials. +THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENTS PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE. + +3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement. + +4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a "Release") the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form. +EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. + +5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it. + +6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intels licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intels and its sublicensees products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source. + +7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. + +8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS. + +9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient. + +10. GENERAL. + +10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts. + +10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach. + +10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipients rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intels express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion. + +10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all "click-to-accept" or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intels standard acknowledgment form that are in conflict with these terms, shall be of no force or effect. + +10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions. + +10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located. + +10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person. + +10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. +ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS +]]> +</sdk:license> + +<!-- SYSTEM IMAGES ........................ --> + +<sdk:system-image> + <sdk:description>Android SDK Platform 2.3.7</sdk:description> + <sdk:revision>2</sdk:revision> + <sdk:api-level>10</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>55463895</sdk:size> + <sdk:checksum type="sha1">34e2436f69606cdfe35d3ef9112f0c64e3ff021d</sdk:checksum> + <sdk:url>sysimg_x86-10_r02.zip</sdk:url> + </sdk:archive> + </sdk:archives> +</sdk:system-image> + +<sdk:system-image> + <sdk:description>Android SDK Platform 4.0.4</sdk:description> + <sdk:revision>1</sdk:revision> + <sdk:api-level>15</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>112619605</sdk:size> + <sdk:checksum type="sha1">d540325952e0f097509622b9e685737584b83e40</sdk:checksum> + <sdk:url>sysimg_x86-15_r01.zip</sdk:url> + </sdk:archive> + </sdk:archives> +</sdk:system-image> + +<sdk:system-image> + <sdk:description>Android SDK Platform 4.1.1</sdk:description> + <sdk:revision>1</sdk:revision> + <sdk:api-level>16</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>131840348</sdk:size> + <sdk:checksum type="sha1">9d35bcaa4f9b40443941f32b8a50337f413c021a</sdk:checksum> + <sdk:url>sysimg_x86-16_r01.zip</sdk:url> + </sdk:archive> + </sdk:archives> +</sdk:system-image> + +<sdk:system-image> + <sdk:description>Android SDK Platform 4.2</sdk:description> + <sdk:revision>1</sdk:revision> + <sdk:api-level>17</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>138799122</sdk:size> + <sdk:checksum type="sha1">ddb3313e8dcd07926003f7b828eafea1115ea35b</sdk:checksum> + <sdk:url>sysimg_x86-17_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 b35b42989838..bc78ea11e6f7 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -1,9 +1,8 @@ - {stdenv, fetchurl, unzip}: let buildSystemImage = args: - stdenv.mkDerivation (args // { + stdenv.mkDerivation (args // { buildInputs = [ unzip ]; buildCommand = '' mkdir -p $out @@ -13,8 +12,8 @@ let }); in { - - sysimg_14 = buildSystemImage { + + sysimg_armeabi-v7a_14 = buildSystemImage { name = "armeabi-v7a-14"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-14_r02.zip; @@ -22,7 +21,7 @@ in }; }; - sysimg_15 = buildSystemImage { + sysimg_armeabi-v7a_15 = buildSystemImage { name = "armeabi-v7a-15"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-15_r02.zip; @@ -30,7 +29,7 @@ in }; }; - sysimg_16 = buildSystemImage { + sysimg_armeabi-v7a_16 = buildSystemImage { name = "armeabi-v7a-16"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-16_r03.zip; @@ -38,13 +37,75 @@ in }; }; - sysimg_17 = buildSystemImage { + sysimg_armeabi-v7a_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_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"; + }; + }; + + sysimg_x86_10 = buildSystemImage { + name = "x86-10"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-10_r02.zip; + sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d"; + }; + }; + + sysimg_x86_15 = buildSystemImage { + name = "x86-15"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-15_r01.zip; + sha1 = "d540325952e0f097509622b9e685737584b83e40"; + }; + }; + + sysimg_x86_16 = buildSystemImage { + name = "x86-16"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-16_r01.zip; + sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a"; }; }; -} - \ No newline at end of file + sysimg_x86_17 = buildSystemImage { + name = "x86-17"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-17_r01.zip; + sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b"; + }; + }; + + sysimg_mips_15 = buildSystemImage { + name = "mips-15"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-15_r01.zip; + sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9"; + }; + }; + + sysimg_mips_16 = buildSystemImage { + name = "mips-16"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-16_r04.zip; + sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; + }; + }; + + sysimg_mips_17 = buildSystemImage { + name = "mips-17"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-17_r01.zip; + sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; + }; + }; + } |