From 39508bc471f56b0af0db90a9538a2dc7e2986387 Mon Sep 17 00:00:00 2001 From: JP Cottin Date: Fri, 21 Apr 2023 23:31:34 +0000 Subject: [PATCH 1/5] Add dependencies requested by requests --- setup.py | 2 ++ 1 file changed, 2 insertions(+) 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", From efb2e4668ce13e81f2a2149667545f485e2eeaad Mon Sep 17 00:00:00 2001 From: JP Cottin Date: Fri, 21 Apr 2023 23:34:11 +0000 Subject: [PATCH 2/5] add explicitely a ANDROID_AVD_HOME variable --- emu/templates/launch-emulator.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/emu/templates/launch-emulator.sh b/emu/templates/launch-emulator.sh index 51988dff..388949c6 100644 --- a/emu/templates/launch-emulator.sh +++ b/emu/templates/launch-emulator.sh @@ -239,6 +239,8 @@ fi # Add qemu specific parameters var_append LAUNCH_CMD -qemu -append panic=1 +export ANDROID_AVD_HOME=/android-home + # Kick off the emulator exec $LAUNCH_CMD # All done! From 3736e8cb7d0042aa41a96383dffe7d91d715bd79 Mon Sep 17 00:00:00 2001 From: JP Cottin Date: Fri, 21 Apr 2023 23:36:25 +0000 Subject: [PATCH 3/5] remove a dead link in the doc --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 78856155..4f3ee0b3 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,8 @@ 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. +- 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/) From e183e34bf2b501b2380a4df7d3b08c0927f92185 Mon Sep 17 00:00:00 2001 From: JP Cottin Date: Fri, 21 Apr 2023 23:56:41 +0000 Subject: [PATCH 4/5] comment on python-venv --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f3ee0b3..fdcb46eb 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ 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. +- 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 From 70b4526617eac6945537d8373df4b1746b2d3ea2 Mon Sep 17 00:00:00 2001 From: JP Cottin Date: Fri, 21 Apr 2023 23:58:40 +0000 Subject: [PATCH 5/5] check on the existance of ANDROID_AVD_HOME before adding one --- emu/templates/launch-emulator.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/emu/templates/launch-emulator.sh b/emu/templates/launch-emulator.sh index 388949c6..921861e4 100644 --- a/emu/templates/launch-emulator.sh +++ b/emu/templates/launch-emulator.sh @@ -239,7 +239,9 @@ fi # Add qemu specific parameters var_append LAUNCH_CMD -qemu -append panic=1 -export ANDROID_AVD_HOME=/android-home +if [ ! -z "${ANDROID_AVD_HOME}" ]; then + export ANDROID_AVD_HOME=/android-home +fi # Kick off the emulator exec $LAUNCH_CMD