chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Android changes

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-04-30 10:35:49 +02:00
parent d151c29b80
commit c7957b5460
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
shells/accentor-android.nix
View file

@ -3,15 +3,16 @@ let
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; }; baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; }; jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; };
kotlinls = import ../packages/kotlin-language-server/default.nix { inherit pkgs; }; kotlinls = import ../packages/kotlin-language-server/default.nix { inherit pkgs; };
buildToolsVersion = "28.0.3";
composed = pkgs.androidenv.composeAndroidPackages { composed = pkgs.androidenv.composeAndroidPackages {
toolsVersion = "26.1.1"; toolsVersion = "26.1.1";
platformToolsVersion = "28.0.1"; platformToolsVersion = "29.0.6";
buildToolsVersions = [ "28.0.3" ]; buildToolsVersions = [ buildToolsVersion ];
# includeEmulator = false; # includeEmulator = false;
# emulatorVersion = "27.2.0"; # emulatorVersion = "27.2.0";
platformVersions = [ "29" ]; platformVersions = [ "29" ];
includeSources = false; includeSources = true;
includeDocs = false; includeDocs = true;
# includeSystemImages = false; # includeSystemImages = false;
# systemImageTypes = [ "default" ]; # systemImageTypes = [ "default" ];
# abiVersions = [ "armeabi-v7a" ]; # abiVersions = [ "armeabi-v7a" ];
@ -55,7 +56,7 @@ let
sign-release = pkgs.writeScriptBin "sign-release" '' sign-release = pkgs.writeScriptBin "sign-release" ''
#!${pkgs.bash}/bin/bash #!${pkgs.bash}/bin/bash
BUILD_TOOLS_PATH="${composed.androidsdk}/libexec/android-sdk/build-tools/28.0.3" BUILD_TOOLS_PATH="${composed.androidsdk}/libexec/android-sdk/build-tools/${buildToolsVersion}"
REPO_ROOT="$(git rev-parse --show-toplevel)" REPO_ROOT="$(git rev-parse --show-toplevel)"
APK_DIR="$REPO_ROOT/app/build/outputs/apk/release" APK_DIR="$REPO_ROOT/app/build/outputs/apk/release"