summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSander van der Burg <svanderburg@gmail.com>2014-02-27 23:08:13 +0100
committerSander van der Burg <svanderburg@gmail.com>2014-02-27 23:08:13 +0100
commit70449b220d31e27a95c0d54841fcd3f1ee9df920 (patch)
tree142cbc3394882508c30ba0ffd90fbc565a55e0b7
parentebe57b1ac83792128c8ef613f9009e2234bb05b3 (diff)
androidsdk: fix activity launching
-rw-r--r--pkgs/development/mobile/androidenv/emulate-app.nix2
-rw-r--r--pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index f5cacbcba887..278c073dc586 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation {
${stdenv.lib.optionalString (app != null) ''
# Install the App through the debugger, if it has not been installed yet
- if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell 'pm list packages | grep -x package:${package}')" = "" ]
+ if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ]
then
if [ -d "${app}" ]
then
diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
index 5187b0e02387..cad4503dc96e 100644
--- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
@@ -6,5 +6,5 @@ androidenv.emulateApp {
platformVersion = "16";
useGoogleAPIs = true;
package = "com.appcelerator.kitchensink";
- activity = "KitchensinkActivity";
+ activity = ".KitchensinkActivity";
}