diff --git a/pythonforandroid/bootstraps/common/build/build.py b/pythonforandroid/bootstraps/common/build/build.py index 51e0a5fa94..c6076d4cb3 100644 --- a/pythonforandroid/bootstraps/common/build/build.py +++ b/pythonforandroid/bootstraps/common/build/build.py @@ -167,6 +167,8 @@ def clean(tinfo): continue if fn.endswith('.py') and byte_compile_python: fn = compile_py_file(fn, optimize_python=optimize_python) + if fn is None: + continue files.append((fn, relpath(realpath(fn), sd))) files.sort() # deterministic diff --git a/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle b/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle index 750a435d99..f4292f4d1d 100644 --- a/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle +++ b/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle @@ -35,6 +35,9 @@ android { versionCode {{ args.numeric_version }} versionName '{{ args.version }}' manifestPlaceholders = {{ args.manifest_placeholders}} + ndk { + abiFilters 'arm64-v8a' + } } @@ -110,7 +113,7 @@ android { dependencies { {%- for aar in aars %} - implementation(name: '{{ aar }}', ext: 'aar') + implementation files('libs/{{ aar }}.aar') {%- endfor -%} {%- for jar in jars %} implementation files('src/main/libs/{{ jar }}') diff --git a/pythonforandroid/bootstraps/service_library/build/templates/AndroidManifest.tmpl.xml b/pythonforandroid/bootstraps/service_library/build/templates/AndroidManifest.tmpl.xml index 017a1588ec..8766a2efc9 100644 --- a/pythonforandroid/bootstraps/service_library/build/templates/AndroidManifest.tmpl.xml +++ b/pythonforandroid/bootstraps/service_library/build/templates/AndroidManifest.tmpl.xml @@ -9,7 +9,6 @@ {% for name in service_names %} {% endfor %} diff --git a/pythonforandroid/recipes/jiter/__init__.py b/pythonforandroid/recipes/jiter/__init__.py new file mode 100644 index 0000000000..7b927ce1eb --- /dev/null +++ b/pythonforandroid/recipes/jiter/__init__.py @@ -0,0 +1,10 @@ +from pythonforandroid.recipe import RustCompiledComponentsRecipe + + +class JiterRecipe(RustCompiledComponentsRecipe): + version = '0.5.0' + url = 'https://pypi.python.org/packages/source/j/jiter/jiter-{version}.tar.gz' + site_packages_name = 'jiter' + + +recipe = JiterRecipe() diff --git a/pythonforandroid/recipes/orjson/__init__.py b/pythonforandroid/recipes/orjson/__init__.py new file mode 100644 index 0000000000..cec5d1515c --- /dev/null +++ b/pythonforandroid/recipes/orjson/__init__.py @@ -0,0 +1,10 @@ +from pythonforandroid.recipe import RustCompiledComponentsRecipe + + +class OrjsonRecipe(RustCompiledComponentsRecipe): + version = '3.10.6' + url = 'https://pypi.python.org/packages/source/o/orjson/orjson-{version}.tar.gz' + site_packages_name = 'orjson' + + +recipe = OrjsonRecipe() \ No newline at end of file diff --git a/pythonforandroid/recipes/tiktoken/__init__.py b/pythonforandroid/recipes/tiktoken/__init__.py new file mode 100644 index 0000000000..bdd9eb3cb0 --- /dev/null +++ b/pythonforandroid/recipes/tiktoken/__init__.py @@ -0,0 +1,10 @@ +from pythonforandroid.recipe import RustCompiledComponentsRecipe + + +class TiktokenRecipe(RustCompiledComponentsRecipe): + version = '0.7.0' + url = 'https://pypi.python.org/packages/source/t/tiktoken/tiktoken-{version}.tar.gz' + site_packages_name = "tiktoken" + + +recipe = TiktokenRecipe() \ No newline at end of file