diff options
Diffstat (limited to 'nixpkgs/pkgs/development/mobile')
17 files changed, 926 insertions, 188 deletions
diff --git a/nixpkgs/pkgs/development/mobile/adb-sync/default.nix b/nixpkgs/pkgs/development/mobile/adb-sync/default.nix index c88ac5dbca5e..90087c48ddda 100644 --- a/nixpkgs/pkgs/development/mobile/adb-sync/default.nix +++ b/nixpkgs/pkgs/development/mobile/adb-sync/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { license = licenses.asl20; platforms = platforms.unix; hydraPlatforms = []; - maintainers = with maintainers; [ scolobb ma27 ]; + maintainers = with maintainers; [ scolobb ]; }; } diff --git a/nixpkgs/pkgs/development/mobile/androidenv/README.md b/nixpkgs/pkgs/development/mobile/androidenv/README.md new file mode 100644 index 000000000000..159265abb480 --- /dev/null +++ b/nixpkgs/pkgs/development/mobile/androidenv/README.md @@ -0,0 +1,6 @@ +# How to update + +1. `./fetchrepo.sh` +2. `./mkrepo.sh` +3. Check the `repo.json` diff for new stable versions of `tools`, `platform-tools`, `build-tools`, `emulator` and/or `ndk` +4. Update the relevant argument defaults in `compose-android-packages.nix` diff --git a/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix b/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix index 536a025d15b4..da2c3f31a45e 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix @@ -2,8 +2,8 @@ deployAndroidPackage { inherit package os; - buildInputs = [ autoPatchelfHook makeWrapper ] ++ - lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ]; + buildInputs = [ makeWrapper ] ++ + lib.optionals (os == "linux") [ autoPatchelfHook pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib @@ -14,8 +14,10 @@ deployAndroidPackage { autoPatchelf --no-recurse $packageBaseDir ''} - wrapProgram $PWD/mainDexClasses \ - --prefix PATH : ${pkgs.jdk8}/bin + ${lib.optionalString (lib.toInt (lib.versions.major package.revision) < 33) '' + wrapProgram $PWD/mainDexClasses \ + --prefix PATH : ${pkgs.jdk8}/bin + ''} ''; noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build } diff --git a/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix b/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix index ade111cf3f9e..3abad6b41f62 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix @@ -1,9 +1,9 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}: deployAndroidPackage { inherit package os; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = lib.optional (os == "linux") [ pkgs.stdenv.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optional (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' autoPatchelf $packageBaseDir/bin ''; diff --git a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index ed4cb4d527b1..217922886df8 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -3,18 +3,18 @@ }: { toolsVersion ? "26.1.1" -, platformToolsVersion ? "31.0.3" -, buildToolsVersions ? [ "31.0.0" ] +, platformToolsVersion ? "33.0.2" +, buildToolsVersions ? [ "32.0.0" ] , includeEmulator ? false -, emulatorVersion ? "30.9.0" +, emulatorVersion ? "31.3.7" , platformVersions ? [] , includeSources ? false , includeSystemImages ? false , systemImageTypes ? [ "google_apis_playstore" ] -, abiVersions ? [ "armeabi-v7a" ] +, abiVersions ? [ "armeabi-v7a" "arm64-v8a" ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "22.1.7171670" +, ndkVersion ? "24.0.8215888" , ndkVersions ? [ndkVersion] , useGoogleAPIs ? false , useGoogleTVAddOns ? false @@ -120,7 +120,8 @@ rec { }; platform-tools = import ./platform-tools.nix { - inherit deployAndroidPackage os autoPatchelfHook pkgs lib; + inherit deployAndroidPackage autoPatchelfHook pkgs lib; + os = if stdenv.system == "aarch64-darwin" then "macosx" else os; # "macosx" is a universal binary here package = packages.platform-tools.${platformToolsVersion}; }; @@ -171,7 +172,7 @@ rec { cmake = map (version: import ./cmake.nix { - inherit deployAndroidPackage os autoPatchelfHook pkgs lib; + inherit deployAndroidPackage os autoPatchelfHook pkgs lib stdenv; package = packages.cmake.${version}; } ) cmakeVersions; @@ -179,8 +180,8 @@ rec { # Creates a NDK bundle. makeNdkBundle = ndkVersion: import ./ndk-bundle { - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools; - package = packages.ndk-bundle.${ndkVersion}; + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools stdenv; + package = packages.ndk-bundle.${ndkVersion} or packages.ndk.${ndkVersion}; }; # All NDK bundles. @@ -221,6 +222,12 @@ rec { '') plugins} ''; + # Function that automatically links the default NDK plugin. + linkNdkPlugin = {name, plugin, check}: + lib.optionalString check '' + ln -s ${plugin}/libexec/android-sdk/${name} ${name} + ''; + # Function that automatically links a plugin for which only one version exists linkPlugin = {name, plugin, check ? true}: lib.optionalString check '' @@ -258,7 +265,7 @@ rec { ${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }} ${linkPlugins { name = "cmake"; plugins = cmake; }} ${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; }} - ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} + ${linkNdkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} ${lib.optionalString includeSystemImages '' mkdir -p system-images diff --git a/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix b/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix index eec99498a160..94a76078c477 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix @@ -2,33 +2,35 @@ deployAndroidPackage { inherit package os; - buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optionals (os == "linux") [ - pkgs.glibc - pkgs.xorg.libX11 - pkgs.xorg.libXext - pkgs.xorg.libXdamage - pkgs.xorg.libXfixes - pkgs.xorg.libxcb - pkgs.xorg.libXcomposite - pkgs.xorg.libXcursor - pkgs.xorg.libXi - pkgs.xorg.libXrender - pkgs.xorg.libXtst - pkgs.libcxx - pkgs.libGL - pkgs.libpulseaudio - pkgs.libuuid - pkgs.zlib - pkgs.ncurses5 - pkgs.stdenv.cc.cc - pkgs_i686.glibc - pkgs.expat - pkgs.freetype - pkgs.nss - pkgs.nspr - pkgs.alsa-lib - ]; + buildInputs = [ makeWrapper ] + ++ lib.optionals (os == "linux") (with pkgs; [ + autoPatchelfHook + glibc + libcxx + libGL + libpulseaudio + libuuid + zlib + ncurses5 + stdenv.cc.cc + pkgs_i686.glibc + expat + freetype + nss + nspr + alsa-lib + ]) ++ (with pkgs.xorg; [ + libX11 + libXext + libXdamage + libXfixes + libxcb + libXcomposite + libXcursor + libXi + libXrender + libXtst + ]); patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib addAutoPatchelfSearchPath $packageBaseDir/lib64 diff --git a/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index a854069e75a5..0f3e7e4faa23 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, pkgsHostHost, makeWrapper, autoPatchelfHook +{ stdenv, lib, pkgs, pkgsHostHost, makeWrapper, autoPatchelfHook , deployAndroidPackage, package, os, platform-tools }: @@ -9,25 +9,25 @@ let in deployAndroidPackage { inherit package os; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; autoPatchelfIgnoreMissingDeps = true; - buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.python2 pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out pkgs.libxml2 ]; + buildInputs = lib.optional (os == "linux") [ pkgs.zlib ]; patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . - # Fix the shebangs of the auto-generated scripts. - substituteInPlace ./build/tools/make_standalone_toolchain.py \ - --replace '#!/bin/bash' '#!${pkgs.bash}/bin/bash' - - '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' - patch -p1 \ - --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} || true - wrapProgram ./build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" - '' + '' - # TODO: allow this stuff rm -rf docs tests + # Ndk now has a prebuilt toolchains inside, the file layout has changed, we do a symlink + # to still support the old standalone toolchains builds. + if [ -d $out/libexec/android-sdk/ndk ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then + ln -sf $out/libexec/android-sdk/ndk/${package.revision} $out/libexec/android-sdk/ndk-bundle + elif [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then + echo "The ndk-bundle layout has changed. The nix expressions have to be updated!" + exit 1 + fi + # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 ]; then addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 diff --git a/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch deleted file mode 100644 index 7af2d44a0f20..000000000000 --- a/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur android-ndk-r18b/build/tools/make_standalone_toolchain.py android-ndk-r18b-new/build/tools/make_standalone_toolchain.py ---- android-ndk-r18b/build/tools/make_standalone_toolchain.py 2018-10-11 12:49:38.000000000 +0200 -+++ android-ndk-r18b-new/build/tools/make_standalone_toolchain.py 2018-11-20 21:55:52.689991420 +0100 -@@ -30,7 +30,7 @@ - import sys - import tempfile - import textwrap -- -+import subprocess - - THIS_DIR = os.path.realpath(os.path.dirname(__file__)) - NDK_DIR = os.path.realpath(os.path.join(THIS_DIR, '../..')) -@@ -173,6 +173,7 @@ - logger().debug('Copying %s', src_file) - shutil.copy2(src_file, dst_dir) - -+ subprocess.check_call(["chmod", "-R", "+w", dst]) - - def make_clang_scripts(install_dir, triple, api, windows): - """Creates Clang wrapper scripts. -@@ -365,6 +366,7 @@ - install_headers = os.path.join(install_sysroot, 'usr/include') - os.makedirs(os.path.dirname(install_headers)) - shutil.copytree(headers, install_headers) -+ subprocess.check_call(["chmod", "-R", "+w", install_path]) - - arch_headers = os.path.join(sysroot, 'usr/include', triple) - copy_directory_contents(arch_headers, os.path.join(install_headers)) -@@ -375,6 +377,7 @@ - install_sysroot, 'usr/lib{}'.format(lib_suffix)) - if os.path.exists(lib_path): - shutil.copytree(lib_path, lib_install) -+ subprocess.check_call(["chmod", "-R", "+w", install_path]) - - static_lib_path = os.path.join(sysroot, 'usr/lib', triple) - static_lib_install = os.path.join(install_sysroot, 'usr/lib') -@@ -389,6 +392,7 @@ - NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver') - gdbserver_install = os.path.join(install_path, 'share', 'gdbserver') - shutil.copytree(gdbserver_path, gdbserver_install) -+ subprocess.check_call(["chmod", "-R", "+w", install_path]) - - toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) - dirs = os.listdir(toolchain_lib_dir) diff --git a/nixpkgs/pkgs/development/mobile/androidenv/platform-tools.nix b/nixpkgs/pkgs/development/mobile/androidenv/platform-tools.nix index c39d966959a3..52443486bbb6 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/platform-tools.nix @@ -2,8 +2,7 @@ deployAndroidPackage { inherit package os; - buildInputs = [ autoPatchelfHook ] - ++ lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; + buildInputs = lib.optionals (os == "linux") [ autoPatchelfHook pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib64 autoPatchelf --no-recurse $packageBaseDir/lib64 diff --git a/nixpkgs/pkgs/development/mobile/androidenv/repo.json b/nixpkgs/pkgs/development/mobile/androidenv/repo.json index d8d55e641bbf..bf69c67820b0 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/repo.json +++ b/nixpkgs/pkgs/development/mobile/androidenv/repo.json @@ -425,16 +425,16 @@ "archives": [ { "os": "windows", - "sha1": "1d35ead3cdfaf6e51001455f66a2db102dd647b7", - "size": 167191, - "url": "https://dl.google.com/android/repository/gvm-windows_v1_7_0.zip" + "sha1": "7be9c46e3bbf4ab107fa614e426f925584ce310b", + "size": 166975, + "url": "https://dl.google.com/android/repository/gvm-windows_v1_8_0.zip" } ], "displayName": "Android Emulator Hypervisor Driver for AMD Processors (installer)", "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", - "revision": "1.7.0" + "revision": "1.8.0" }, "extras;google;admob_ads_sdk": { "archives": [ @@ -1241,6 +1241,21 @@ }, "23": { "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "2d1ae21b1978e202917b7c6a5f49ab8bc87c6417", + "size": 493891214, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-23_r33.zip" + } + ], + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-23-google_apis-arm64-v8a", + "path": "system-images/android-23/google_apis/arm64-v8a", + "revision": "23-google_apis-arm64-v8a" + }, "armeabi-v7a": { "archives": [ { @@ -1366,6 +1381,21 @@ }, "28": { "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "8901ad796ada9d40272c429427ba628de6919281", + "size": 835797733, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-28_r01.zip" + } + ], + "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-28-google_apis_playstore-arm64-v8a", + "path": "system-images/android-28/google_apis_playstore/arm64-v8a", + "revision": "28-google_apis_playstore-arm64-v8a" + }, "x86": { "archives": [ { @@ -1562,15 +1592,15 @@ "archives": [ { "os": "macosx", - "sha1": "bef2699f7fd74fe0c4106a8898833074de72984d", - "size": 1394878415, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-darwin.zip" + "sha1": "8a1fa9a050a3894fb65c785d6b536e182be30e7f", + "size": 1468377491, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r09-darwin.zip" }, { "os": "linux", - "sha1": "bef2699f7fd74fe0c4106a8898833074de72984d", - "size": 1394878415, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-linux.zip" + "sha1": "8a1fa9a050a3894fb65c785d6b536e182be30e7f", + "size": 1468377491, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r09-linux.zip" } ], "displayName": "Google Play ARM 64 v8a System Image", @@ -1582,29 +1612,183 @@ "x86_64": { "archives": [ { + "os": "all", + "sha1": "a80de967f445b3cf71803425f4e4b21b36e11d66", + "size": 1423631458, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r09.zip" + } + ], + "displayName": "Google Play Intel x86 Atom_64 System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-31-google_apis_playstore-x86_64", + "path": "system-images/android-31/google_apis_playstore/x86_64", + "revision": "31-google_apis_playstore-x86_64" + } + } + }, + "32": { + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "macosx", + "sha1": "a03c886495ad5a3c3929fb0fc122c8ded743eef0", + "size": 1393496124, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r03-darwin.zip" + }, + { + "os": "linux", + "sha1": "a03c886495ad5a3c3929fb0fc122c8ded743eef0", + "size": 1393496124, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r03-linux.zip" + } + ], + "displayName": "Google Play ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-32-google_apis_playstore-arm64-v8a", + "path": "system-images/android-32/google_apis_playstore/arm64-v8a", + "revision": "32-google_apis_playstore-arm64-v8a" + }, + "x86_64": { + "archives": [ + { "os": "windows", - "sha1": "6450e33574aba4746682cfa72edd4e89947fed38", - "size": 1433583169, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-windows.zip" + "sha1": "734f2fde664518688a402ad8198b10cf093c5871", + "size": 1437465460, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-windows.zip" }, { "os": "macosx", - "sha1": "6450e33574aba4746682cfa72edd4e89947fed38", - "size": 1433583169, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-darwin.zip" + "sha1": "734f2fde664518688a402ad8198b10cf093c5871", + "size": 1437465460, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-darwin.zip" }, { "os": "linux", - "sha1": "6450e33574aba4746682cfa72edd4e89947fed38", - "size": 1433583169, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-linux.zip" + "sha1": "734f2fde664518688a402ad8198b10cf093c5871", + "size": 1437465460, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-linux.zip" } ], "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", - "name": "system-image-31-google_apis_playstore-x86_64", - "path": "system-images/android-31/google_apis_playstore/x86_64", - "revision": "31-google_apis_playstore-x86_64" + "name": "system-image-32-google_apis_playstore-x86_64", + "path": "system-images/android-32/google_apis_playstore/x86_64", + "revision": "32-google_apis_playstore-x86_64" + } + } + }, + "33": { + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "macosx", + "sha1": "0b850a4f317d7a6abe854a6845705c9ca4437764", + "size": 1492105537, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r05-darwin.zip" + }, + { + "os": "linux", + "sha1": "0b850a4f317d7a6abe854a6845705c9ca4437764", + "size": 1492105537, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r05-linux.zip" + } + ], + "displayName": "Google Play ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-33-google_apis_playstore-arm64-v8a", + "path": "system-images/android-33/google_apis_playstore/arm64-v8a", + "revision": "33-google_apis_playstore-arm64-v8a" + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "ed2931ebef4f7bedff8610254748d6496ce5d3c4", + "size": 1496628942, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33_r05.zip" + } + ], + "displayName": "Google Play Intel x86 Atom_64 System Image", + "license": "android-sdk-preview-license", + "name": "system-image-33-google_apis_playstore-x86_64", + "path": "system-images/android-33/google_apis_playstore/x86_64", + "revision": "33-google_apis_playstore-x86_64" + } + } + }, + "Tiramisu": { + "android-tv": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "4b70bed5ffb28162cdde7852e0597d957910270d", + "size": 840304267, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-Tiramisu_r03.zip" + } + ], + "displayName": "Android TV ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-Tiramisu-android-tv-arm64-v8a", + "path": "system-images/android-Tiramisu/android-tv/arm64-v8a", + "revision": "Tiramisu-android-tv-arm64-v8a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "547a24d9dec83e11486ef4ea45848d9fa99f35c2", + "size": 832895525, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-Tiramisu_r03.zip" + } + ], + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-Tiramisu-android-tv-x86", + "path": "system-images/android-Tiramisu/android-tv/x86", + "revision": "Tiramisu-android-tv-x86" + } + } + }, + "TiramisuPrivacySandbox": { + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "macosx", + "sha1": "4653d7aa2dbd2629c3afc1c700284de0f7791bb2", + "size": 1514681298, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r05-darwin.zip" + }, + { + "os": "linux", + "sha1": "4653d7aa2dbd2629c3afc1c700284de0f7791bb2", + "size": 1514681298, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r05-linux.zip" + } + ], + "displayName": "Google Play ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", + "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a", + "revision": "TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a" + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "2a4ea6ce714155ea8ddfea26cf61ad219f32c02a", + "size": 1519169526, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-TiramisuPrivacySandbox_r05.zip" + } + ], + "displayName": "Google Play Intel x86 Atom_64 System Image", + "license": "android-sdk-preview-license", + "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64", + "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64", + "revision": "TiramisuPrivacySandbox-google_apis_playstore-x86_64" } } } @@ -3148,6 +3332,87 @@ "name": "build-tools", "path": "build-tools/31.0.0", "revision": "31.0.0" + }, + "32.0.0": { + "archives": [ + { + "os": "windows", + "sha1": "2134fdd4a00b3501b87597d100182e169eaa8c6a", + "size": 56720035, + "url": "https://dl.google.com/android/repository/210b77e4bc623bd4cdda4dae790048f227972bd2.build-tools_r32-windows.zip" + }, + { + "os": "macosx", + "sha1": "27b56ee9a313f0f34f009dea343f3887d3f72b17", + "size": 52875135, + "url": "https://dl.google.com/android/repository/5219cc671e844de73762e969ace287c29d2e14cd.build-tools_r32-macosx.zip" + }, + { + "os": "linux", + "sha1": "c7f2c700aafd9f7a2da187d80901481b80156719", + "size": 54940436, + "url": "https://dl.google.com/android/repository/build-tools_r32-linux.zip" + } + ], + "displayName": "Android SDK Build-Tools 32", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/32.0.0", + "revision": "32.0.0" + }, + "32.1.0-rc1": { + "archives": [ + { + "os": "windows", + "sha1": "af2abccfe48f9109ca0bddbec023234a4a68446b", + "size": 54636210, + "url": "https://dl.google.com/android/repository/21014bc1a76d38d0dcb79b3b3f49f40ea5a53c10.build-tools_r32.1-rc1-windows.zip" + }, + { + "os": "linux", + "sha1": "4af23395f3a7cb4a5c01623347622f881a4772fd", + "size": 57403070, + "url": "https://dl.google.com/android/repository/build-tools_r32.1-rc1-linux.zip" + }, + { + "os": "macosx", + "sha1": "38c166a60de3cb799ff1ad5b855234579d05e7b6", + "size": 59462877, + "url": "https://dl.google.com/android/repository/c165e9b235479731f416c7aea22d065819c7ce23.build-tools_r32.1-rc1-macosx.zip" + } + ], + "displayName": "Android SDK Build-Tools 32.1-rc1", + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/32.1.0-rc1", + "revision": "32.1.0-rc1" + }, + "33.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "c561971600d4ce682b128b0bd5d4ab71c5f2ad35", + "size": 56000182, + "url": "https://dl.google.com/android/repository/build-tools_r33-linux.zip" + }, + { + "os": "macosx", + "sha1": "3693851532ba9640710d2dd360d85aa5b04c5151", + "size": 60023096, + "url": "https://dl.google.com/android/repository/build-tools_r33-macosx.zip" + }, + { + "os": "windows", + "sha1": "f4ef853e5e755ea5ffc50de73a9e420fc76c662e", + "size": 55610532, + "url": "https://dl.google.com/android/repository/build-tools_r33-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 33", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/33.0.0", + "revision": "33.0.0" } }, "cmake": { @@ -3205,6 +3470,33 @@ "path": "cmake/3.18.1", "revision": "3.18.1" }, + "3.22.1": { + "archives": [ + { + "os": "macosx", + "sha1": "8604eeef9adadb626dbb70a7ff58a87e6a7b967a", + "size": 38223266, + "url": "https://dl.google.com/android/repository/cmake-3.22.1-darwin.zip" + }, + { + "os": "linux", + "sha1": "fd0a48b4a758310df8c7aa51f59840ed48fe7ed8", + "size": 22308647, + "url": "https://dl.google.com/android/repository/cmake-3.22.1-linux.zip" + }, + { + "os": "windows", + "sha1": "292778f32a7d5183e1c49c7897b870653f2d2c1b", + "size": 16116742, + "url": "https://dl.google.com/android/repository/cmake-3.22.1-windows.zip" + } + ], + "displayName": "CMake 3.22.1", + "license": "android-sdk-preview-license", + "name": "cmake", + "path": "cmake/3.22.1", + "revision": "3.22.1" + }, "3.6.4111459": { "archives": [ { @@ -3395,62 +3687,143 @@ "name": "cmdline-tools", "path": "cmdline-tools/5.0", "revision": "5.0" + }, + "6.0": { + "archives": [ + { + "os": "linux", + "sha1": "8d47ab9a90caa60ce8a95d7e384ec64633bc13b4", + "size": 119650630, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip" + }, + { + "os": "macosx", + "sha1": "bbd306940256ccb698edae47a56fb8da36d63e0b", + "size": 119650616, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-8092744_latest.zip" + }, + { + "os": "windows", + "sha1": "3098050fb2bdc7cc8a07bdef4dd13035f9f78d2a", + "size": 119629490, + "url": "https://dl.google.com/android/repository/commandlinetools-win-8092744_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/6.0", + "revision": "6.0" + }, + "7.0": { + "archives": [ + { + "os": "linux", + "sha1": "5e7bf2dd563d34917d32f3c5920a85562a795c93", + "size": 114168525, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip" + }, + { + "os": "macosx", + "sha1": "9a663c49dbd3709fc2b7d49db2814b383d811b4a", + "size": 114168511, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-8512546_latest.zip" + }, + { + "os": "windows", + "sha1": "1bdd32ac4b9fffea04f5bc341108e8b4fea6f32c", + "size": 114147385, + "url": "https://dl.google.com/android/repository/commandlinetools-win-8512546_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/7.0", + "revision": "7.0" } }, "emulator": { - "30.8.4": { + "31.2.10": { "archives": [ { "os": "linux", - "sha1": "140f833321684f7696e4b9012636c45eaa5b6a4a", - "size": 277522999, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-7600983.zip" + "sha1": "1f2c3ddeb2c9ac4feef5946098a0a710d08e9c6d", + "size": 276337904, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-8420304.zip" }, { "os": "windows", - "sha1": "c26170db8aba1bbfcfe63481e95a90bc7b2ff129", - "size": 326723360, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-7600983.zip" + "sha1": "206491b5c4e531b2c66dc80402702b9fa1a64c2a", + "size": 345300871, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-8420304.zip" }, { "os": "macosx", - "sha1": "9811a649c516153681471f897a02398947640045", - "size": 315292647, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7600983.zip" + "sha1": "677b6a00c145eb8bf4306daeb2231c8efd507177", + "size": 313876814, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8420304.zip" } ], "displayName": "Android Emulator", "license": "android-sdk-license", "name": "emulator", "path": "emulator", - "revision": "30.8.4" + "revision": "31.2.10" }, - "30.9.0": { + "31.3.8": { "archives": [ { "os": "macosx", - "sha1": "b197e04e0543271899a1bd956a3f828e1159086b", - "size": 315330447, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7634933.zip" + "sha1": "7214e8384c97a7c9875142149d3bf9c940e9b5a0", + "size": 347222379, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8598121.zip" }, { "os": "linux", - "sha1": "5cdfb2b27f24ded22348535f2de28ec373e203c8", - "size": 277557089, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-7634933.zip" + "sha1": "0f781977a6cc5377b64444121ff75a513841a4fa", + "size": 293782881, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-8598121.zip" }, { "os": "windows", - "sha1": "aed5ba827d0c1d68c8663a4d786f184aaeb939ed", - "size": 326205048, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-7634933.zip" + "sha1": "b4f30bad4e68da41cc9bd44965259b2111a011a1", + "size": 380151866, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-8598121.zip" } ], "displayName": "Android Emulator", "license": "android-sdk-preview-license", "name": "emulator", "path": "emulator", - "revision": "30.9.0" + "revision": "31.3.8" + }, + "31.3.9": { + "archives": [ + { + "os": "macosx", + "sha1": "6e7b549113252728cfe0992d58e8cb1790dce9d6", + "size": 347241742, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8700579.zip" + }, + { + "os": "linux", + "sha1": "1c1a7ef65476d3de34f19455a0093cb68e8e90f7", + "size": 293801439, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-8700579.zip" + }, + { + "os": "windows", + "sha1": "ea834211b199a7fcf6b6758a53c4594d01b44ab9", + "size": 380168712, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-8700579.zip" + } + ], + "displayName": "Android Emulator", + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "31.3.9" } }, "extras": { @@ -3481,32 +3854,32 @@ "path": "extras/google/auto", "revision": "1.1" }, - "2.0-rc2": { + "2.0": { "archives": [ { - "os": "linux", - "sha1": "dbb771c2be299fd88ca05d8b0e381c369a7f7009", - "size": 6947111, - "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc2.zip" + "os": "macosx", + "sha1": "d4d12a2173fef608ad62b94fed3a112bfa146759", + "size": 8030009, + "url": "https://dl.google.com/android/repository/desktop-head-unit-darwin-x64_r02.0.zip" }, { - "os": "macosx", - "sha1": "ec1f68f9acc234f8493f4ba24954d1d45291b736", - "size": 8593497, - "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc2.zip" + "os": "linux", + "sha1": "77e3f80c2834e1fad33f56539ceb0215da408fab", + "size": 6895443, + "url": "https://dl.google.com/android/repository/desktop-head-unit-linux-x64_r02.0.zip" }, { "os": "windows", - "sha1": "471ae94176512f859580e6ac9e8b8f5010632c78", - "size": 7130894, - "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc2.zip" + "sha1": "680418d5aca256cce151eb7f9527294e95b6bb8a", + "size": 6801703, + "url": "https://dl.google.com/android/repository/desktop-head-unit-windows-x64_r02.0.zip" } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "license": "android-sdk-preview-license", + "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", - "revision": "2.0-rc2" + "revision": "2.0" } }, "ndk": { @@ -4265,6 +4638,276 @@ "name": "ndk", "path": "ndk/23.0.7599858", "revision": "23.0.7599858" + }, + "23.1.7779620": { + "archives": [ + { + "os": "macosx", + "sha1": "4f54966e733f92964f097887bedfdd0faa0f7042", + "size": 978956151, + "url": "https://dl.google.com/android/repository/android-ndk-r23b-darwin.zip" + }, + { + "os": "linux", + "sha1": "f47ec4c4badd11e9f593a8450180884a927c330d", + "size": 725122099, + "url": "https://dl.google.com/android/repository/android-ndk-r23b-linux.zip" + }, + { + "os": "windows", + "sha1": "6e3fb50022c611a2b13d02f5de5c21cc7206a298", + "size": 788638042, + "url": "https://dl.google.com/android/repository/android-ndk-r23b-windows.zip" + } + ], + "displayName": "NDK (Side by side) 23.1.7779620", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/23.1.7779620", + "revision": "23.1.7779620" + }, + "23.2.8568313": { + "archives": [ + { + "os": "macosx", + "sha1": "1fc65d8f6083f3f5cd01e0cf97c6adc10f4f076f", + "size": 982917530, + "url": "https://dl.google.com/android/repository/android-ndk-r23c-darwin.zip" + }, + { + "os": "linux", + "sha1": "e5053c126a47e84726d9f7173a04686a71f9a67a", + "size": 724733960, + "url": "https://dl.google.com/android/repository/android-ndk-r23c-linux.zip" + }, + { + "os": "windows", + "sha1": "f2c5def76a9de371f27d028864fe301ab4fe0cf8", + "size": 788336993, + "url": "https://dl.google.com/android/repository/android-ndk-r23c-windows.zip" + } + ], + "displayName": "NDK (Side by side) 23.2.8568313", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/23.2.8568313", + "revision": "23.2.8568313" + }, + "24.0.7856742-rc1": { + "archives": [ + { + "os": "macosx", + "sha1": "de560fe3bc8b760d598a08bc329030cf36f6a490", + "size": 950494966, + "url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-darwin.zip" + }, + { + "os": "linux", + "sha1": "4e43e498699b00cab8b07d431b65a0c1aa022313", + "size": 684615573, + "url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-linux.zip" + }, + { + "os": "windows", + "sha1": "ade5412e9ac0dd206824e9249a5fbc11c9c248bf", + "size": 690364848, + "url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-windows.zip" + } + ], + "displayName": "NDK (Side by side) 24.0.7856742", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/24.0.7856742", + "revision": "24.0.7856742-rc1" + }, + "24.0.7956693-rc2": { + "archives": [ + { + "os": "macosx", + "sha1": "9f95216133c78e871a31b35278dce524956579bd", + "size": 948103952, + "url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-darwin.zip" + }, + { + "os": "linux", + "sha1": "78f3006243c0bc051c7c7bfb939689032e7c41ba", + "size": 695411089, + "url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-linux.zip" + }, + { + "os": "windows", + "sha1": "d4eb40c03259094ae3ea05134ee17af717f48d6d", + "size": 661623688, + "url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-windows.zip" + } + ], + "displayName": "NDK (Side by side) 24.0.7956693", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/24.0.7956693", + "revision": "24.0.7956693-rc2" + }, + "24.0.8079956-rc3": { + "archives": [ + { + "os": "macosx", + "sha1": "c7f3552e5bd6a76ea7fd460fe49afb4c7bdc5e39", + "size": 901524232, + "url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-darwin.zip" + }, + { + "os": "linux", + "sha1": "de2a02e65c1c720336fe991dc708875539df85bf", + "size": 667835859, + "url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-linux.zip" + }, + { + "os": "windows", + "sha1": "dbc9f19cc758285192c26238b4b87be207464bf2", + "size": 663173050, + "url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-windows.zip" + } + ], + "displayName": "NDK (Side by side) 24.0.8079956", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/24.0.8079956", + "revision": "24.0.8079956-rc3" + }, + "24.0.8215888": { + "archives": [ + { + "os": "macosx", + "sha1": "fc4d0d86e3c802e8c4a6865d99cff58b336e2d5a", + "size": 901417197, + "url": "https://dl.google.com/android/repository/android-ndk-r24-darwin.zip" + }, + { + "os": "linux", + "sha1": "eceb18f147282eb93615eff1ad84a9d3962fbb31", + "size": 667731974, + "url": "https://dl.google.com/android/repository/android-ndk-r24-linux.zip" + }, + { + "os": "windows", + "sha1": "75f9c281c64762d18c84da465f486c60def47829", + "size": 663076813, + "url": "https://dl.google.com/android/repository/android-ndk-r24-windows.zip" + } + ], + "displayName": "NDK (Side by side) 24.0.8215888", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/24.0.8215888", + "revision": "24.0.8215888" + }, + "25.0.8151533-rc1": { + "archives": [ + { + "os": "macosx", + "sha1": "32024b773d65dd445cf8cf52156a331c544ee7e0", + "size": 918358459, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-darwin.zip" + }, + { + "os": "linux", + "sha1": "0acca5e8faa47a6c961c358d724a93e33f8d6caf", + "size": 680831029, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-linux.zip" + }, + { + "os": "windows", + "sha1": "a5486182f79696794eb1a216c11f5e29652e72d1", + "size": 676453790, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-windows.zip" + } + ], + "displayName": "NDK (Side by side) 25.0.8151533", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/25.0.8151533", + "revision": "25.0.8151533-rc1" + }, + "25.0.8221429-rc2": { + "archives": [ + { + "os": "macosx", + "sha1": "51961d41ffe63ac664edf26b51906ec07213e088", + "size": 915502522, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-darwin.zip" + }, + { + "os": "linux", + "sha1": "3b7435a1a851a4b2dadeafa466f323db9235dd9a", + "size": 677975159, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-linux.zip" + }, + { + "os": "windows", + "sha1": "4fd188fdba7413c397bcaa342039d07266c954b6", + "size": 673597865, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-windows.zip" + } + ], + "displayName": "NDK (Side by side) 25.0.8221429", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/25.0.8221429", + "revision": "25.0.8221429-rc2" + }, + "25.0.8355429-rc3": { + "archives": [ + { + "os": "macosx", + "sha1": "224594abb41357c20cb4a9f4a732c484b2e743ba", + "size": 748047157, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-darwin.zip" + }, + { + "os": "linux", + "sha1": "79c8db05e20edde0cbb02d2326e7b8405f7eb977", + "size": 510520692, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-linux.zip" + }, + { + "os": "windows", + "sha1": "7d2c398045f6bbad03f6fb2f2ba419a2a48ab1e7", + "size": 506142216, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-windows.zip" + } + ], + "displayName": "NDK (Side by side) 25.0.8355429", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/25.0.8355429", + "revision": "25.0.8355429-rc3" + }, + "25.0.8528842-rc4": { + "archives": [ + { + "os": "macosx", + "sha1": "d7f344ecc68518a8178d15b1b80e27bc5c69f00d", + "size": 716633626, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-darwin.zip" + }, + { + "os": "linux", + "sha1": "d13f688fd286709f0d950c75119ec9fcad8a47ff", + "size": 531018178, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-linux.zip" + }, + { + "os": "windows", + "sha1": "668b063c7c535c4f8be52c84acebb5779935203b", + "size": 464031742, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-windows.zip" + } + ], + "displayName": "NDK (Side by side) 25.0.8528842", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/25.0.8528842", + "revision": "25.0.8528842-rc4" } }, "ndk-bundle": { @@ -4962,32 +5605,32 @@ } }, "platform-tools": { - "31.0.3": { + "33.0.2": { "archives": [ { "os": "macosx", - "sha1": "15f6f7e97b35994d538a0fc5147ad5fb502ba03d", - "size": 13227985, - "url": "https://dl.google.com/android/repository/e8b2b4cbe47c728c1e54c5f524440b52d4e1a33c.platform-tools_r31.0.3-darwin.zip" + "sha1": "9b5661e0c18a2e5b6935e2b96bcc7be580cd6dcd", + "size": 13038676, + "url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-darwin.zip" }, { "os": "linux", - "sha1": "f09581347ed39978abb3a99c6bb286de6adc98ef", - "size": 13302579, - "url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-linux.zip" + "sha1": "6bf4f747ad929b02378b44ce083b4502d26109c7", + "size": 7406632, + "url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-linux.zip" }, { "os": "windows", - "sha1": "26bc02bbd920e8ed461ae526cc4c69d773b72395", - "size": 11912013, - "url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-windows.zip" + "sha1": "2d7599f59b54f02c4ecd33d656091a3c1e55ad9c", + "size": 6304111, + "url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-windows.zip" } ], "displayName": "Android SDK Platform-Tools", "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", - "revision": "31.0.3" + "revision": "33.0.2" } }, "platforms": { @@ -5375,6 +6018,36 @@ "path": "platforms/android-31", "revision": "31" }, + "32": { + "archives": [ + { + "os": "all", + "sha1": "afae86ed55d29733d50996ffed832f2d1bd75b9a", + "size": 66108299, + "url": "https://dl.google.com/android/repository/platform-32_r01.zip" + } + ], + "displayName": "Android SDK Platform 32", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-32", + "revision": "32" + }, + "33": { + "archives": [ + { + "os": "all", + "sha1": "298f5800e37f3c089ab0eb58d4f6aef4058b689b", + "size": 67324871, + "url": "https://dl.google.com/android/repository/platform-33_r01.zip" + } + ], + "displayName": "Android SDK Platform 33", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-33", + "revision": "33" + }, "4": { "archives": [ { @@ -5500,9 +6173,51 @@ "name": "platforms", "path": "platforms/android-9", "revision": "9" + }, + "TiramisuPrivacySandbox": { + "archives": [ + { + "os": "all", + "sha1": "8dd74a564f71c8381f5230682c5da291d230cc81", + "size": 67918949, + "url": "https://dl.google.com/android/repository/platform-TiramisuPrivacySandbox_r03.zip" + } + ], + "displayName": "Android SDK Platform TiramisuPrivacySandbox", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-TiramisuPrivacySandbox", + "revision": "TiramisuPrivacySandbox" } }, "skiaparser": { + "1": { + "archives": [ + { + "os": "linux", + "sha1": "72be6f7630b28e02449a8bbadff7589688f3c3d6", + "size": 7014665, + "url": "https://dl.google.com/android/repository/skiaparser-8339467-linux.zip" + }, + { + "os": "macosx", + "sha1": "53c688b0d2458bcead273791745fb27efa3b58ce", + "size": 17231541, + "url": "https://dl.google.com/android/repository/skiaparser-8339467-mac.zip" + }, + { + "os": "windows", + "sha1": "8d08dc7c56531092f1704a24b3457bd0455a4be1", + "size": 10174177, + "url": "https://dl.google.com/android/repository/skiaparser-8339467-win.zip" + } + ], + "displayName": "Layout Inspector image server for API 31 and T", + "license": "android-sdk-license", + "name": "skiaparser", + "path": "skiaparser/3", + "revision": "1" + }, "3": { "archives": [ { @@ -5813,6 +6528,36 @@ "name": "sources", "path": "sources/android-30", "revision": "30" + }, + "31": { + "archives": [ + { + "os": "all", + "sha1": "2934d1b2975a8bf9fff112bd45a04f6d90db743e", + "size": 46383726, + "url": "https://dl.google.com/android/repository/sources-31_r01.zip" + } + ], + "displayName": "Sources for Android 31", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-31", + "revision": "31" + }, + "32": { + "archives": [ + { + "os": "all", + "sha1": "d7195c6de611b99d7ec3565eabe2fd21268b7f98", + "size": 46933291, + "url": "https://dl.google.com/android/repository/sources-32_r01.zip" + } + ], + "displayName": "Sources for Android 32", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-32", + "revision": "32" } }, "tools": { diff --git a/nixpkgs/pkgs/development/mobile/androidenv/tools/25.nix b/nixpkgs/pkgs/development/mobile/androidenv/tools/25.nix index 7489569d5071..5ce21a2fee3e 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/tools/25.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/tools/25.nix @@ -58,5 +58,5 @@ deployAndroidPackage { ${postInstall} ''; - meta.licenses = lib.licenses.unfree; + meta.license = lib.licenses.unfree; } diff --git a/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix b/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix index a768a120547f..361e02661f37 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix @@ -3,8 +3,12 @@ deployAndroidPackage { name = "androidsdk"; inherit os package; - buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXrender pkgs.xorg.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.xorg.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; + buildInputs = [ makeWrapper ] + ++ lib.optional (os == "linux") ( + (with pkgs; [ autoPatchelfHook glibc freetype fontconfig fontconfig.lib]) + ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) + ++ (with pkgs_i686; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) + ); patchInstructions = '' ${lib.optionalString (os == "linux") '' @@ -36,5 +40,5 @@ deployAndroidPackage { ${postInstall} ''; - meta.licenses = lib.licenses.unfree; + meta.license = lib.licenses.unfree; } diff --git a/nixpkgs/pkgs/development/mobile/checkra1n/default.nix b/nixpkgs/pkgs/development/mobile/checkra1n/default.nix index 110bb187f61c..a44a6d8b2b8d 100644 --- a/nixpkgs/pkgs/development/mobile/checkra1n/default.nix +++ b/nixpkgs/pkgs/development/mobile/checkra1n/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Jailbreak for iPhone 5s though iPhone X, iOS 12.0 and up"; homepage = "https://checkra.in/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ onny ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/nixpkgs/pkgs/development/mobile/genymotion/default.nix index 2b94ed14aa9c..d8413117a30b 100644 --- a/nixpkgs/pkgs/development/mobile/genymotion/default.nix +++ b/nixpkgs/pkgs/development/mobile/genymotion/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { suitable for application testing. ''; homepage = "https://www.genymotion.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = ["x86_64-linux"]; maintainers = [ maintainers.puffnfresh ]; diff --git a/nixpkgs/pkgs/development/mobile/gomobile/default.nix b/nixpkgs/pkgs/development/mobile/gomobile/default.nix index 4087f1cca807..44841d889c43 100644 --- a/nixpkgs/pkgs/development/mobile/gomobile/default.nix +++ b/nixpkgs/pkgs/development/mobile/gomobile/default.nix @@ -9,15 +9,15 @@ buildGoModule { pname = "gomobile"; - version = "unstable-2021-06-14"; + version = "unstable-2022-05-18"; - vendorSha256 = "1irgkgv72rakg7snk1bnp10ibr64ykz9l40s59l4fnl63zsh12a0"; + vendorSha256 = "sha256-AmOy3X+d2OD7ZLbFuy+SptdlgWbZJaXYEgO79M64ufE="; src = fetchgit { - rev = "7c8f154d100840bc5828285bb390bbae1cb5a98c"; + rev = "8578da9835fd365e78a6e63048c103b27a53a82c"; name = "gomobile"; url = "https://go.googlesource.com/mobile"; - sha256 = "1w9mra1mqf60iafp0ywvja5196fjsjyfhvz4yizqq4qkyll5qmj1"; + sha256 = "sha256-AOR/p+DW83f2+BOxm2rFXBCrotcIyunK3UzQ/dnauWY="; }; subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ]; @@ -32,8 +32,7 @@ buildGoModule { postPatch = '' substituteInPlace cmd/gomobile/env.go --replace \ 'tmpdir, err = ioutil.TempDir("", "gomobile-work-")' \ - 'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "gomobile-work")' \ - --replace '"io/ioutil"' "" + 'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "gomobile-work")' substituteInPlace cmd/gomobile/init.go --replace \ 'tmpdir, err = ioutil.TempDir(gomobilepath, "work-")' \ 'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "work")' @@ -43,13 +42,18 @@ buildGoModule { postInstall = '' mkdir -p $out/src/golang.org/x ln -s $src $out/src/golang.org/x/mobile - wrapProgram $out/bin/gomobile \ + ''; + + postFixup = '' + for bin in $(ls $out/bin); do + wrapProgram $out/bin/$bin \ + --suffix GOPATH : $out \ '' + lib.optionalString withAndroidPkgs '' - --prefix PATH : "${androidPkgs.androidsdk}/bin" \ - --set ANDROID_NDK_HOME "${androidPkgs.androidsdk}/libexec/android-sdk/ndk-bundle" \ - --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \ + --prefix PATH : "${androidPkgs.androidsdk}/bin" \ + --set-default ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \ '' + '' - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" + done ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/mobile/webos/novacomd.nix b/nixpkgs/pkgs/development/mobile/webos/novacomd.nix index dc330ce6d4e9..5e12fb5ce8a3 100644 --- a/nixpkgs/pkgs/development/mobile/webos/novacomd.nix +++ b/nixpkgs/pkgs/development/mobile/webos/novacomd.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { buildInputs = [ libusb-compat-0_1 ]; + # Workaround build failure on -fno-common toolchains: + # ld: src/host/usb-linux.c:82: multiple definition of `t_recovery_queue'; + # src/host/recovery.c:45: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/mobile/xpwn/default.nix b/nixpkgs/pkgs/development/mobile/xpwn/default.nix index 075a247f12c9..e23ed132ce44 100644 --- a/nixpkgs/pkgs/development/mobile/xpwn/default.nix +++ b/nixpkgs/pkgs/development/mobile/xpwn/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1qw9vbk463fpnvvvfgzxmn9add2p30k832s09mlycr7z1hrh3wyf"; }; + # Workaround build failure on -fno-common toolchains: + # ld: ../ipsw-patch/libxpwn.a(libxpwn.c.o):(.bss+0x4): multiple definition of + # `endianness'; CMakeFiles/xpwn-bin.dir/src/xpwn.cpp.o:(.bss+0x0): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' rm BUILD # otherwise `mkdir build` fails on case insensitive file systems sed -r -i \ @@ -25,6 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ]; meta = with lib; { + broken = stdenv.isDarwin; homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; description = "Custom NOR firmware loader/IPSW generator for the iPhone"; license = licenses.gpl3Plus; |