diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-03 13:50:33 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-03 13:50:33 +0200 |
| commit | 8f248885d39d0f06f8f0da7fcc798bc91bfca59a (patch) | |
| tree | cd65e0fb6773170e7dc51355dda59d139d569762 /android/qa/desktop/Makefile | |
| parent | db1ade41bf6c878753801ed241d6bd1d94466e12 (diff) | |
Use $(ANDROID_SDK_HOME) for adb instead of assuming it is in $PATH
Diffstat (limited to 'android/qa/desktop/Makefile')
| -rw-r--r-- | android/qa/desktop/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 3d113628fa73..8e1811d6c98c 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -238,26 +238,26 @@ build-ant: copy-stuff unset JAVA_HOME && $(ANT) debug install: copy-stuff - adb shell rm -r $(APP_DATA_PATH) + $(ANDROID_SDK_HOME)/platform-tools/adb shell rm -r $(APP_DATA_PATH) unset JAVA_HOME && $(ANT) debug install @echo @echo 'Run it with "make run"' @echo uninstall: - adb uninstall $(APP_PACKAGE) + $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) run: echo "FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf -env:INIFILENAME=file:///assets/program/sofficerc" > cmdline - adb push cmdline $(APP_DATA_PATH)/cmdline - adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline" + $(ANDROID_SDK_HOME)/platform-tools/adb push cmdline $(APP_DATA_PATH)/cmdline + $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline" # add -e lo-strace yes # if you want that # If you reinstall an app several times, even if you uninstall it # between, disk space seems to leak that won't get recycled until you # stop and start... stop-start-cycle: - adb shell stop && adb shell start && sleep 10 + $(ANDROID_SDK_HOME)/platform-tools/adb shell stop && $(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10 clean: $(ANT) clean |