From e48d97f640c410667464ff34c54617912145a430 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sat, 17 Aug 2019 10:48:05 +0200 Subject: androidenv: fix deployment of google_apis* system images Fixes #56866 --- pkgs/development/mobile/androidenv/compose-android-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/development/mobile') diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index e5802c12e81..28c3b120f39 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -121,6 +121,12 @@ rec { deployAndroidPackage { inherit os; package = system-images-packages.${apiVersion}.${type}.${abiVersion}; + # Patch 'google_apis' system images so they're recognized by the sdk. + # Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead + # of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error. + patchInstructions = stdenv.lib.optionalString (stdenv.lib.hasPrefix "google_apis" type) '' + sed -i '/^Addon.Vendor/d' source.properties + ''; } ) abiVersions ) systemImageTypes -- cgit 1.4.1