forked from mirrors/nixpkgs
Updated Android SDK to version 22.05, updated all plugins, and added mesa to the search path of the emulators to enable OpenGL acceleration
This commit is contained in:
Sander van der Burg
parent
b6d43bb6a3
commit
ab9be1b809
|
|
@ -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"/>
|
||||
|
|
@ -782,6 +850,23 @@ August 15, 2011
|
|||
|
||||
<!-- EXTRAS VENDOR=GOOGLE ....................... -->
|
||||
|
||||
<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>
|
||||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
|
||||
, platformTools, support, platforms, sysimages, addons
|
||||
, platformTools, buildTools, support, platforms, sysimages, addons
|
||||
, zlib_32bit
|
||||
, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit
|
||||
, libX11, libXext, libXrender, libxcb, libXau, libXdmcp
|
||||
, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit
|
||||
, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa
|
||||
, freetype, fontconfig, gtk, atk
|
||||
}:
|
||||
{platformVersions, useGoogleAPIs}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "android-sdk-21";
|
||||
name = "android-sdk-22.05";
|
||||
|
||||
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
|
||||
then fetchurl {
|
||||
url = http://dl.google.com/android/android-sdk_r21-linux.tgz;
|
||||
md5 = "7f8d73b629f808cdcfc9f9900bbd7580";
|
||||
url = http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz;
|
||||
md5 = "8201b10c21510f082c54f58a9bb082c8";
|
||||
}
|
||||
else if stdenv.system == "x86_64-darwin" then fetchurl {
|
||||
url = http://dl.google.com/android/android-sdk_r21-macosx.zip;
|
||||
md5 = "67e46adca90dd18d7291443f6c15d6af";
|
||||
url = http://dl.google.com/android/android-sdk_r22.0.5-macosx.zip;
|
||||
md5 = "94f3cbe896c332b94ee0408ae610a4b8";
|
||||
}
|
||||
else throw "platform not ${stdenv.system} supported!";
|
||||
|
||||
|
|
@ -61,14 +61,14 @@ stdenv.mkDerivation {
|
|||
for i in emulator emulator-arm emulator-mips emulator-x86
|
||||
do
|
||||
wrapProgram `pwd`/$i \
|
||||
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib
|
||||
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib
|
||||
done
|
||||
|
||||
${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
|
||||
for i in emulator64-arm emulator64-mips emulator64-x86
|
||||
do
|
||||
wrapProgram `pwd`/$i \
|
||||
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib
|
||||
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib
|
||||
done
|
||||
''}
|
||||
''}
|
||||
|
|
@ -107,6 +107,7 @@ stdenv.mkDerivation {
|
|||
|
||||
cd ..
|
||||
ln -s ${platformTools}/platform-tools
|
||||
ln -s ${buildTools}/build-tools
|
||||
ln -s ${support}/support
|
||||
|
||||
# Symlink required Google API add-ons
|
||||
|
|
|
|||
54
pkgs/development/mobile/androidenv/build-tools.nix
Normal file
54
pkgs/development/mobile/androidenv/build-tools.nix
Normal file
|
|
@ -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 ];
|
||||
}
|
||||
|
|
@ -3,10 +3,15 @@
|
|||
rec {
|
||||
platformTools = import ./platform-tools.nix {
|
||||
inherit (pkgs) stdenv fetchurl unzip;
|
||||
inherit (pkgs_i686) zlib ncurses;
|
||||
stdenv_32bit = pkgs_i686.stdenv;
|
||||
};
|
||||
|
||||
buildTools = import ./build-tools.nix {
|
||||
inherit (pkgs) stdenv fetchurl unzip;
|
||||
stdenv_32bit = pkgs_i686.stdenv;
|
||||
zlib_32bit = pkgs_i686.zlib;
|
||||
};
|
||||
|
||||
support = import ./support.nix {
|
||||
inherit (pkgs) stdenv fetchurl unzip;
|
||||
};
|
||||
|
|
@ -31,10 +36,10 @@ rec {
|
|||
|
||||
androidsdk = import ./androidsdk.nix {
|
||||
inherit (pkgs) stdenv fetchurl unzip makeWrapper;
|
||||
inherit (pkgs) freetype fontconfig gtk atk;
|
||||
inherit (pkgs) freetype fontconfig gtk atk mesa;
|
||||
inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp;
|
||||
|
||||
inherit platformTools support platforms sysimages addons;
|
||||
inherit platformTools buildTools support platforms sysimages addons;
|
||||
|
||||
stdenv_32bit = pkgs_i686.stdenv;
|
||||
zlib_32bit = pkgs_i686.zlib;
|
||||
|
|
@ -43,6 +48,7 @@ rec {
|
|||
libXau_32bit = pkgs_i686.xorg.libXau;
|
||||
libXdmcp_32bit = pkgs_i686.xorg.libXdmcp;
|
||||
libXext_32bit = pkgs_i686.xorg.libXext;
|
||||
mesa_32bit = pkgs_i686.mesa;
|
||||
};
|
||||
|
||||
androidsdk_4_1 = androidsdk {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
xsltproc generate-sysimages.xsl repository-7.xml > sysimages.nix
|
||||
xsltproc generate-sysimages.xsl repository-8.xml > sysimages.nix
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<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" />
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}:
|
||||
{stdenv, stdenv_32bit, fetchurl, unzip}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "android-platform-tools-r16";
|
||||
name = "android-platform-tools-r18.0.1";
|
||||
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
|
||||
then fetchurl {
|
||||
url = https://dl-ssl.google.com/android/repository/platform-tools_r16-linux.zip;
|
||||
sha1 = "84d563ae5e324f223f335f11bf511bf6207c05fb";
|
||||
url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-linux.zip;
|
||||
sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387";
|
||||
}
|
||||
else if stdenv.system == "x86_64-darwin" then fetchurl {
|
||||
url = https://dl-ssl.google.com/android/repository/platform-tools_r16-macosx.zip;
|
||||
sha1 = "fbb0f8d2786a83b8c3eb6df402e706e136db8fed";
|
||||
url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-macosx.zip;
|
||||
sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387";
|
||||
}
|
||||
else throw "System ${stdenv.system} not supported!";
|
||||
|
||||
|
|
@ -21,20 +21,12 @@ stdenv.mkDerivation {
|
|||
|
||||
${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
|
||||
''
|
||||
for i in aapt adb aidl dexdump fastboot llvm-rs-cc
|
||||
for i in adb fastboot
|
||||
do
|
||||
patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
|
||||
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i
|
||||
done
|
||||
|
||||
patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib aapt
|
||||
patchelf --set-rpath ${ncurses}/lib:${stdenv_32bit.gcc.gcc}/lib adb
|
||||
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib aidl
|
||||
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib fastboot
|
||||
patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib dexdump
|
||||
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib llvm-rs-cc
|
||||
''}
|
||||
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -41,8 +41,16 @@ in
|
|||
sysimg_17 = buildSystemImage {
|
||||
name = "armeabi-v7a-17";
|
||||
src = fetchurl {
|
||||
url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r01.zip;
|
||||
sha1 = "45b9344473e0a6d063c2b1fe58d8cd47d307905e";
|
||||
url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r02.zip;
|
||||
sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c";
|
||||
};
|
||||
};
|
||||
|
||||
sysimg_18 = buildSystemImage {
|
||||
name = "armeabi-v7a-18";
|
||||
src = fetchurl {
|
||||
url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r01.zip;
|
||||
sha1 = "5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue