diff --git a/README.md b/README.md index 78856155..fdcb46eb 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,9 @@ Please file issues if you notice that anything is not working as expected. These demos are intended to be run on a linux OS. Your system must meet the following requirements: -- A Python interpreter must be installed. -- ADB must be available on the path. ADB comes as part of the [Android - SDK](http://www.androiddocs.com/sdk/installing/index.html). Note that - installing the command line tools is sufficient. +- A Python interpreter must be installed (python3 with python3-venv to create virtual environments) +- ADB must be available on the path. ADB comes as part of th Android SDK. + Note that installing the command line tools is sufficient. - [Docker](https://docs.docker.com/v17.12/install/) must be installed. Make sure you can run it as [non-root user](https://docs.docker.com/install/linux/linux-postinstall/) diff --git a/emu/templates/launch-emulator.sh b/emu/templates/launch-emulator.sh index 51988dff..921861e4 100644 --- a/emu/templates/launch-emulator.sh +++ b/emu/templates/launch-emulator.sh @@ -239,6 +239,10 @@ fi # Add qemu specific parameters var_append LAUNCH_CMD -qemu -append panic=1 +if [ ! -z "${ANDROID_AVD_HOME}" ]; then + export ANDROID_AVD_HOME=/android-home +fi + # Kick off the emulator exec $LAUNCH_CMD # All done! diff --git a/setup.py b/setup.py index e6da2479..289afd05 100644 --- a/setup.py +++ b/setup.py @@ -121,6 +121,8 @@ # Any package you put here will be installed by pip when your project is # installed, so they must be valid existing projects. install_requires=[ + "urllib3==1.26", + "markupsafe==2.0.1", "requests", "jinja2==2.11.1", "console-menu",