Unverified Commit facdea69 authored by Artturin's avatar Artturin Committed by GitHub
Browse files

androidenv: updates for Android API 35 (#336113)

parents cc32826a 9ce6da76

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -8245,6 +8245,13 @@ 
    github = "hacker1024";

    githubId = 20849728;

  };

  hadilq = {

    name = "Hadi Lashkari Ghouchani";

    email = "hadilq.dev@gmail.com";

    github = "hadilq";

    githubId = 5190539;

    keys = [ { fingerprint = "AD3D 53CB A68A FEC0 8065  BCBB 416A D9E8 E372 C075"; } ];

  };

  hagl = {

    email = "harald@glie.be";

    github = "hagl";

pkgs/development/mobile/androidenv/compose-android-packages.nix

+3 −3
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


{ cmdLineToolsVersion ? "13.0"

, toolsVersion ? "26.1.1"

, platformToolsVersion ? "35.0.1"

, buildToolsVersions ? [ "34.0.0" ]

, platformToolsVersion ? "35.0.2"

, buildToolsVersions ? [ "35.0.0" ]

, includeEmulator ? false

, emulatorVersion ? "35.1.4"

, platformVersions ? []
@@ -15,7 +15,7 @@ 
, abiVersions ? [ "x86" "x86_64" "armeabi-v7a" "arm64-v8a" ]

, cmakeVersions ? [ ]

, includeNDK ? false

, ndkVersion ? "26.3.11579264"

, ndkVersion ? "27.0.12077973"

, ndkVersions ? [ndkVersion]

, useGoogleAPIs ? false

, useGoogleTVAddOns ? false

pkgs/development/mobile/androidenv/default.nix

+7 −1
Original line number Diff line number Diff line
@@ -16,11 +16,17 @@ rec { 
  };



  androidPkgs = composeAndroidPackages {

    platformVersions = [ "28" "29" "30" "31" "32" "33" "34" ];

    platformVersions = [ "28" "29" "30" "31" "32" "33" "34" "35" ];

    includeEmulator = true;

    includeSystemImages = true;

    includeNDK = true;

  };



  test-suite = pkgs.callPackage ./test-suite.nix {};



  meta = with pkgs.lib; {

    description = "Android SDK & sdkmanager";

    homepage = "https://developer.android.com/tools/sdkmanager";

    maintainers = with maintainers; [ numinit hadilq ];

  };

}

pkgs/development/mobile/androidenv/emulate-app.nix

+2 −2
Original line number Diff line number Diff line 
{ composeAndroidPackages, stdenv, lib, runtimeShell }:

{ name

, app ? null

, platformVersion ? "33"

, abiVersion ? "armeabi-v7a"

, platformVersion ? "35"

, abiVersion ? "x86"

, systemImageType ? "default"

, enableGPU ? false # Enable GPU acceleration. It's deprecated, instead use `configOptions` below.

, configOptions ? (

pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix

+7 −8
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ let 
  # Declaration of versions for everything. This is useful since these

  # versions may be used in multiple places in this Nix expression.

  android = {

    platforms = [ "34" ];

    platforms = [ "35" ];

    systemImageTypes = [ "google_apis" ];

    abis = [ "arm64-v8a" "x86_64" ];

    abis = [ "x86_64" ];

  };



  # If you copy this example out of nixpkgs, something like this will work:
@@ -116,10 +116,9 @@ pkgs.mkShell rec { 
      echo "installed_packages_section: ''${installed_packages_section}"



      packages=(

        "build-tools;34.0.0" "cmdline-tools;11.0" \

        "emulator" "patcher;v4" "platform-tools" "platforms;android-34" \

        "system-images;android-34;google_apis;arm64-v8a" \

        "system-images;android-34;google_apis;x86_64"

        "build-tools;35.0.0" "cmdline-tools;13.0" \

        "emulator" "patcher;v4" "platform-tools" "platforms;android-35" \

        "system-images;android-35;google_apis;x86_64"

      )



      for package in "''${packages[@]}"; do
@@ -142,7 +141,7 @@ pkgs.mkShell rec { 
      excluded_packages=(

        "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \

        "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \

        "platforms;android-31" "platforms;android-32" "platforms;android-33" \

        "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" \

        "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \

        "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \

        "sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \
@@ -169,7 +168,7 @@ pkgs.mkShell rec { 
      nativeBuildInputs = [ androidSdk androidEmulator jdk ];

    } ''

      avdmanager delete avd -n testAVD || true

      echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-34;google_apis;x86_64'

      echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-35;google_apis;x86_64'

      result=$(avdmanager list avd)



      if [[ ! $result =~ "Name: testAVD" ]]; then