Add webview app make targets and artifact builds

This should help exercise the webview bootstrap in CI and allow testing
a webview app using the built artifacts.

Author: dbnicholson

.github/workflows/push.yml

@@ -5,6 +5,8 @@ on: ['push', 'pull_request']
 env:
   APK_ARTIFACT_FILENAME: bdist_unit_tests_app-debug-1.1-.apk
   AAB_ARTIFACT_FILENAME: bdist_unit_tests_app-release-1.1-.aab
+  WEBVIEW_APK_ARTIFACT_FILENAME: bdist_unit_tests_webview_app-debug-1.1-.apk
+  WEBVIEW_AAB_ARTIFACT_FILENAME: bdist_unit_tests_webview_app-release-1.1-.aab
   PYTHONFORANDROID_PREREQUISITES_INSTALL_INTERACTIVE: 0
 
 jobs:
@@ -79,13 +81,19 @@ jobs:
       run: |
         mkdir -p apks
         make docker/run/make/with-artifact/apk/testapps-with-numpy
+        make docker/run/make/with-artifact/apk/testapps-webview
     - name: Rename artifact to include the build platform name
       run: |
         mv apks/${{ env.APK_ARTIFACT_FILENAME }} apks/${{ matrix.runs_on }}-${{ env.APK_ARTIFACT_FILENAME }}
+        mv apks/${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }} apks/${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
     - uses: actions/upload-artifact@v1
       with:
         name: ${{ matrix.runs_on }}-${{ env.APK_ARTIFACT_FILENAME }}
         path: apks
+    - uses: actions/upload-artifact@v1
+      with:
+        name: ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
+        path: apks
 
   macos_build_apk:
     name: Unit test apk [ ${{ matrix.runs_on }} ]
@@ -129,13 +137,19 @@ jobs:
           source ci/osx_ci.sh
           arm64_set_path_and_python_version 3.9.7
           make testapps-with-numpy
+          make testapps-webview
       - name: Rename artifact to include the build platform name
         run: |
           mv testapps/on_device_unit_tests/${{ env.APK_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ env.APK_ARTIFACT_FILENAME }}
+          mv testapps/on_device_unit_tests/${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
       - uses: actions/upload-artifact@v1
         with:
           name: ${{ matrix.runs_on }}-${{ env.APK_ARTIFACT_FILENAME }}
           path: ${{ matrix.runs_on }}-${{ env.APK_ARTIFACT_FILENAME }}
+      - uses: actions/upload-artifact@v1
+        with:
+          name: ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
+          path: ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
 
   ubuntu_build_aab:
     name: Unit test aab [ ${{ matrix.runs_on }} ]
@@ -164,13 +178,19 @@ jobs:
       run: |
         mkdir -p aabs
         make docker/run/make/with-artifact/aab/testapps-with-numpy-aab
+        make docker/run/make/with-artifact/aab/testapps-webview-aab
     - name: Rename artifact to include the build platform name
       run: |
         mv aabs/${{ env.AAB_ARTIFACT_FILENAME }} aabs/${{ matrix.runs_on }}-${{ env.AAB_ARTIFACT_FILENAME }}
+        mv aabs/${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }} aabs/${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
     - uses: actions/upload-artifact@v1
       with:
         name: ${{ matrix.runs_on }}-${{ env.AAB_ARTIFACT_FILENAME }}
         path: aabs
+    - uses: actions/upload-artifact@v1
+      with:
+        name: ${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
+        path: aabs
 
   macos_build_aab:
     name: Unit test aab [ ${{ matrix.runs_on }} ]
@@ -214,13 +234,19 @@ jobs:
           source ci/osx_ci.sh
           arm64_set_path_and_python_version 3.9.7
           make testapps-with-numpy-aab
+          make testapps-webview-aab
       - name: Rename artifact to include the build platform name
         run: |
           mv testapps/on_device_unit_tests/${{ env.AAB_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ env.AAB_ARTIFACT_FILENAME }}
+          mv testapps/on_device_unit_tests/${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
       - uses: actions/upload-artifact@v1
         with:
           name: ${{ matrix.runs_on }}-${{ env.AAB_ARTIFACT_FILENAME }}
           path: ${{ matrix.runs_on }}-${{ env.AAB_ARTIFACT_FILENAME }}
+      - uses: actions/upload-artifact@v1
+        with:
+          name: ${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
+          path: ${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
 
   ubuntu_rebuild_updated_recipes:
     name: Test updated recipes for arch ${{ matrix.android_arch }} [ ubuntu-latest ]

Makefile

@@ -47,6 +47,20 @@ testapps-with-numpy-aab: virtualenv
     --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,urllib3,chardet,idna,sqlite3,setuptools,numpy \
     --arch=armeabi-v7a --arch=arm64-v8a --arch=x86_64 --arch=x86 --release
 
+testapps-webview: virtualenv
+	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
+    python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
+    --bootstrap webview --dist-name bdist_unit_tests_webview_app \
+    --requirements sqlite3,libffi,openssl,pyjnius,flask,python3,genericndkbuild \
+    --arch=armeabi-v7a --arch=arm64-v8a --arch=x86_64 --arch=x86
+
+testapps-webview-aab: virtualenv
+	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
+    python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
+    --bootstrap webview --dist-name bdist_unit_tests_webview_app \
+    --requirements sqlite3,libffi,openssl,pyjnius,flask,python3,genericndkbuild \
+    --arch=armeabi-v7a --arch=arm64-v8a --arch=x86_64 --arch=x86
+
 testapps/%: virtualenv
 	$(eval $@_APP_ARCH := $(shell basename $*))
 	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \