Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
4
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
jiten
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Felix C. Stegerman
jiten
Commits
18519329
Verified
Commit
18519329
authored
Aug 08, 2020
by
Felix C. Stegerman
🌈
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
android: new numeric_version scheme; arm64 default
parent
289ecc25
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
9 deletions
+15
-9
android/Makefile
android/Makefile
+12
-5
android/buildozer.spec
android/buildozer.spec
+3
-4
No files found.
android/Makefile
View file @
18519329
...
...
@@ -7,9 +7,10 @@ ifndef APP_VERSION
$(error
git
describe
failed)
endif
_arm64a
:=
arm64-v8a
_arm64n
:=
$(
shell
sed
-n
'/numeric_version/ s/.* 7/8/ p'
buildozer.spec
)
_arm64
:=
APP_ANDROID_ARCH
=
$(_arm64a)
APP_ANDROID_NUMERIC_VERSION
=
$(_arm64n)
NUMERIC
:=
$(
shell
python3
-c
'import sys,functools; print(10*functools.reduce(lambda x,y: x*100+int(y
)
,([1]+sys.argv[1].replace("-","."
)
.split("."
)
+[0]
)
[:5],0
))
'
$(APP_VERSION)
)
ifndef
NUMERIC
$(error
numeric
version
command
failed)
endif
.PHONY
:
debug clean _dir
...
...
@@ -26,16 +27,22 @@ _dir:
.PHONY
:
release-armeabi-v7a release-arm64-v8a
debug-armeabi-v7a
:
_dir
APP_ANDROID_ARCH
=
armeabi-v7a
\
APP_ANDROID_NUMERIC_VERSION
=
$$
((
$(NUMERIC)
+ 1
))
\
buildozer android debug
debug-arm64-v8a
:
_dir
$(_arm64)
buildozer android debug
APP_ANDROID_NUMERIC_VERSION
=
$$
((
$(NUMERIC)
+ 2
))
\
buildozer android debug
release-armeabi-v7a
:
_dir
APP_ANDROID_ARCH
=
armeabi-v7a
\
APP_ANDROID_NUMERIC_VERSION
=
$$
((
$(NUMERIC)
+ 1
))
\
buildozer android release
release-arm64-v8a
:
_dir
$(_arm64)
buildozer android release
APP_ANDROID_NUMERIC_VERSION
=
$$
((
$(NUMERIC)
+ 2
))
\
buildozer android release
.PHONY
:
_setup_root _setup_user
...
...
android/buildozer.spec
View file @
18519329
...
...
@@ -18,11 +18,10 @@ android.ndk = 20b
#android.ndk_path =
#android.sdk_path =
android.accept_sdk_license = True
android.arch = arm
eabi-v7
a
android.arch = arm
64-v8
a
# !!! DON'T FORGET TO UPDATE THIS !!!
# arch (7 = armeabi-v7a, 8 = arm64-v8a) + minapi + version (%02d%02d%02d)
# e.g. armeabi-v7a + minapi 27 + v0.1.1 = 721000101
android.numeric_version = 721000200
# 0.2.0 -------------------vvvvvv
android.numeric_version = 1000200002
p4a.branch = develop
#p4a.source_dir =
p4a.local_recipes = ./p4a-recipes
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment