Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Androidenv fixes #66747

Merged
merged 5 commits into from Aug 20, 2019
Merged

Androidenv fixes #66747

merged 5 commits into from Aug 20, 2019

Conversation

erikarvstedt
Copy link
Member

@erikarvstedt erikarvstedt commented Aug 17, 2019

Please see the individual commit messages.

Use this to test commit androidenv: Fix deployment of google_apis* system images:

emu=$(nix-build --no-out-link - <<'EOF'
with (import /tmp/nixpkgs {});
androidenv.emulateApp {
  name = "google_apis_system";
  platformVersion = "28";
  abiVersion = "x86_64";
  systemImageType = "google_apis_playstore";
}
EOF
)
$emu/bin/run-test-emulator

cc @svanderburg

Things done

All of them.

This feature was originally intended but left unfinished, as indicated
by the unused variables 'args' and 'androidSdkArgNames'.
This system type was previously broken but is now fixed.
Add it here to showcase the common task of launching a fully-fledged Android
system with an included app store.
This greatly improves readability by shortening some of the overlong lines.
Removes some visual clutter.
@@ -1,24 +1,21 @@
{ composeAndroidPackages, stdenv }:
{ name, app ? null
, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default", useGoogleAPIs ? false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does useGoogleAPIs not have an effect elsewhere?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it's unused. The original author forgot to pass it to composeAndroidPackages.

@matthewbauer matthewbauer merged commit 5be571e into NixOS:master Aug 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants