Fix test apps for service_only and webview bootstraps

opacam · opacam · commit a219a734107e · 2018-12-19T10:39:18.000+01:00
diff --git a/testapps/setup_testapp_flask.py b/testapps/setup_testapp_flask.py
@@ -5,11 +5,13 @@
 options = {'apk': {'debug': None,
                    'requirements': 'python2,flask,pyjnius',
                    'android-api': 27,
+                   'ndk-api': 21,
                    'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
                    'dist-name': 'testapp_flask',
                    'ndk-version': '10.3.2',
                    'bootstrap': 'webview',
                    'permissions': ['INTERNET', 'VIBRATE'],
+                   'arch': 'armeabi-v7a',
                    'window': None,
                    }}
 
diff --git a/testapps/setup_testapp_service.py b/testapps/setup_testapp_service.py
@@ -12,7 +12,6 @@
                    'bootstrap': 'service_only',
                    'permissions': ['INTERNET', 'VIBRATE'],
                    'arch': 'armeabi-v7a',
-                   'window': None,
                    }}
 
 package_data = {'': ['*.py']}
diff --git a/testapps/testapp_flask/main.py b/testapps/testapp_flask/main.py
@@ -1,18 +1,13 @@
 print('main.py was successfully called')
 print('this is the new main.py')
 
+import sys
+print('python version is: ' + sys.version)
+print('python path is', sys.path)
+
 import os
 print('imported os')
 
-try:
-    print('contents of ./lib/python2.7/site-packages/ etc.')
-    print(os.listdir('./lib'))
-    print(os.listdir('./lib/python2.7'))
-    print(os.listdir('./lib/python2.7/site-packages'))
-except OSError:
-    print('could not look in dirs')
-    print('this is expected on desktop')
-
 import flask
 print('flask1???')
 
@@ -21,9 +16,6 @@
 import flask
 print('flask???')
 
-import sys
-print('pythonpath is', sys.path)
-
 
 from flask import Flask
 app = Flask(__name__)
