Merge pull request #206968 from jakobkukla/fix-androidenv-emu
androidenv: fix missing `inherit os` and default emulatorVersion
This commit is contained in:
commit
23ec413f4b
|
@ -232,7 +232,6 @@ androidenv.emulateApp {
|
|||
platformVersion = "24";
|
||||
abiVersion = "armeabi-v7a"; # mips, x86, x86_64
|
||||
systemImageType = "default";
|
||||
useGoogleAPIs = false;
|
||||
app = ./MyApp.apk;
|
||||
package = "MyApp";
|
||||
activity = "MainActivity";
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, platformToolsVersion ? "33.0.2"
|
||||
, buildToolsVersions ? [ "32.0.0" ]
|
||||
, includeEmulator ? false
|
||||
, emulatorVersion ? "31.3.7"
|
||||
, emulatorVersion ? "31.3.9"
|
||||
, platformVersions ? []
|
||||
, includeSources ? false
|
||||
, includeSystemImages ? false
|
||||
|
@ -250,7 +250,7 @@ rec {
|
|||
|
||||
by setting nixpkgs config option 'android_sdk.accept_license = true;'.
|
||||
'' else callPackage ./tools.nix {
|
||||
inherit deployAndroidPackage packages toolsVersion;
|
||||
inherit deployAndroidPackage packages toolsVersion os;
|
||||
|
||||
postInstall = ''
|
||||
# Symlink all requested plugins
|
||||
|
|
Loading…
Reference in a new issue