Skip to content

Commit f3d4a2d

Browse files
DCurrentDCurrent
authored
Merge pull request #333 from DCurrent/malik_android_updates
Malik's android updates
2 parents e8f257a + 045cc04 commit f3d4a2d

64 files changed

Lines changed: 2911 additions & 307 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
OpenBOR.elf
55
meta.xml
66
/engine/version.h
7+
/engine/version.txt
78
/engine/resources/Info.plist
89
engine/releases/
910
/engine/ide/vs/.vs/
@@ -17,7 +18,6 @@ tools/win-sdk/*
1718
tools/psp-sdk/*
1819
tools/devkitpro/*
1920
!tools/devkitpro/devkitPro.7z
20-
engine/android/app/src/main/assets/bor.pak
2121
/openbor_vs
2222
engine/ios/Build
2323
**/.DS_Store

‎engine/android/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
/build
77
/keystore.properties
88
*.jks
9+
/app/local.properties
10+
/app/src/main/assets/*.pak

‎engine/android/README‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##############################################
2-
# Msmalik681 Windows 64 bit Build instructions
2+
# Windows 64 bit Build instructions
33
##############################################
44

55
First Download and install JAVA JDK 11. once installed open a command promt window and type "java -version" if it confirms you have java 11 installed.
@@ -9,14 +9,12 @@ Now download the Android SDK but be sure to get the "command line tools only" pa
99
Finally go to the android folder in the source code and run build.bat. If it is the first time it will take time to download everything.
1010

1111
############################################
12-
# Msmalik681 Linux 64 bit Build instructions
12+
# Linux 64 bit Build instructions
1313
############################################
1414

15-
make sure you have java 11 installed check in terminal with "java --version" you can use openjdk 11.
15+
run openbor/engine/android/build.sh it will download everything needed and build openbor debug apk.
1616

17-
(Optional) Download Android SDK but be sure to get the "command line tools only" and extract to "~/.android" now youo should have the path "~/.android/cmdline-tools/sdkmanager".
18-
19-
Finally go to the android folder in the source code and run ./build.sh it will take a time to download everything if this is the first run.
17+
incase the downloads are broken download "commandlinetools-linux-13114758_latest.zip" and "openjdk-17.0.1_linux-x64_bin.zip" extract both to "~/.android" before you run build.sh.
2018

2119
#########################
2220
# Custom Apk instructions
@@ -106,5 +104,5 @@ Anyway for debugging and development, you can
106104
# Development Notes
107105
###################
108106

109-
* Minimum SDK (API Level) is 16 at the moment
107+
* Minimum SDK (API Level) is 21 at the moment
110108
* Support building for two architectures (with included pre-built libraries) arm64-v8a, and armeabi-v7a.

‎engine/android/app/.cxx/abi_configuration_5u53tc49.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"allAbis": [
3+
"armeabi-v7a",
4+
"arm64-v8a"
5+
],
6+
"validAbis": [
7+
"ARMEABI_V7A",
8+
"ARM64_V8A"
9+
]
10+
}

‎engine/android/app/.cxx/abi_configuration_5u53tc49.log‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎engine/android/app/.cxx/abi_configuration_5u53tc49_key.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"ndkHandlerSupportedAbis": [
3+
"ARMEABI_V7A",
4+
"ARM64_V8A",
5+
"X86",
6+
"X86_64"
7+
],
8+
"ndkHandlerDefaultAbis": [
9+
"ARMEABI_V7A",
10+
"ARM64_V8A",
11+
"X86",
12+
"X86_64"
13+
],
14+
"externalNativeBuildAbiFilters": [
15+
"armeabi-v7a",
16+
"arm64-v8a"
17+
],
18+
"ndkConfigAbiFilters": [],
19+
"splitsFilterAbis": [],
20+
"ideBuildOnlyTargetAbi": true
21+
}

‎engine/android/app/.cxx/ndkBuild/debug/arm64-v8a/android_gradle_build.json‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"buildFiles": [
3+
"/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
4+
"/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk"
5+
],
6+
"cleanCommandsComponents": [
7+
[
8+
"/home/malik/.android/ndk/21.4.7075529/ndk-build",
9+
"NDK_PROJECT_PATH\u003dnull",
10+
"APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
11+
"NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
12+
"APP_ABI\u003darm64-v8a",
13+
"NDK_ALL_ABIS\u003darm64-v8a",
14+
"NDK_DEBUG\u003d1",
15+
"APP_PLATFORM\u003dandroid-21",
16+
"NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
17+
"NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
18+
"APP_PLATFORM\u003dandroid-21",
19+
"clean"
20+
]
21+
],
22+
"buildTargetsCommandComponents": [
23+
"/home/malik/.android/ndk/21.4.7075529/ndk-build",
24+
"NDK_PROJECT_PATH\u003dnull",
25+
"APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
26+
"NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
27+
"APP_ABI\u003darm64-v8a",
28+
"NDK_ALL_ABIS\u003darm64-v8a",
29+
"NDK_DEBUG\u003d1",
30+
"APP_PLATFORM\u003dandroid-21",
31+
"NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
32+
"NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
33+
"APP_PLATFORM\u003dandroid-21",
34+
"{LIST_OF_TARGETS_TO_BUILD}"
35+
],
36+
"libraries": {
37+
"cpufeatures-debug-arm64-v8a": {
38+
"buildCommandComponents": [
39+
"/home/malik/.android/ndk/21.4.7075529/ndk-build",
40+
"NDK_PROJECT_PATH\u003dnull",
41+
"APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
42+
"NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
43+
"APP_ABI\u003darm64-v8a",
44+
"NDK_ALL_ABIS\u003darm64-v8a",
45+
"NDK_DEBUG\u003d1",
46+
"APP_PLATFORM\u003dandroid-21",
47+
"NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
48+
"NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
49+
"APP_PLATFORM\u003dandroid-21",
50+
"/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libcpufeatures.a"
51+
],
52+
"toolchain": "toolchain-arm64-v8a",
53+
"abi": "arm64-v8a",
54+
"artifactName": "cpufeatures",
55+
"output": "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libcpufeatures.a"
56+
},
57+
"openbor-debug-arm64-v8a": {
58+
"buildCommandComponents": [
59+
"/home/malik/.android/ndk/21.4.7075529/ndk-build",
60+
"NDK_PROJECT_PATH\u003dnull",
61+
"APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
62+
"NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
63+
"APP_ABI\u003darm64-v8a",
64+
"NDK_ALL_ABIS\u003darm64-v8a",
65+
"NDK_DEBUG\u003d1",
66+
"APP_PLATFORM\u003dandroid-21",
67+
"NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
68+
"NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
69+
"APP_PLATFORM\u003dandroid-21",
70+
"/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libopenbor.so"
71+
],
72+
"toolchain": "toolchain-arm64-v8a",
73+
"abi": "arm64-v8a",
74+
"artifactName": "openbor",
75+
"output": "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libopenbor.so"
76+
}
77+
},
78+
"toolchains": {
79+
"toolchain-arm64-v8a": {
80+
"cCompilerExecutable": "/home/malik/.android/ndk/21.4.7075529/toolchains/llvm/prebuilt/linux-x86_64/bin/clang",
81+
"cppCompilerExecutable": "/home/malik/.android/ndk/21.4.7075529/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++"
82+
}
83+
},
84+
"cFileExtensions": [
85+
"c"
86+
],
87+
"cppFileExtensions": [
88+
"cpp"
89+
]
90+
}

‎engine/android/app/.cxx/ndkBuild/debug/arm64-v8a/android_gradle_build_command_openbor_arm64-v8a.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Executable : /home/malik/.android/ndk/21.4.7075529/ndk-build
2+
arguments :
3+
NDK_PROJECT_PATH=null
4+
APP_BUILD_SCRIPT=/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk
5+
NDK_APPLICATION_MK=/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk
6+
APP_ABI=arm64-v8a
7+
NDK_ALL_ABIS=arm64-v8a
8+
NDK_DEBUG=1
9+
APP_PLATFORM=android-21
10+
NDK_OUT=/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj
11+
NDK_LIBS_OUT=/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib
12+
APP_PLATFORM=android-21
13+
openbor
14+
jvmArgs :
15+

‎engine/android/app/.cxx/ndkBuild/debug/arm64-v8a/android_gradle_build_mini.json‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
{
2+
"buildFiles": [
3+
"/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
4+
"/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk"
5+
],
6+
"cleanCommandsComponents": [
7+
[
8+
"/home/malik/.android/ndk/21.4.7075529/ndk-build",
9+
"NDK_PROJECT_PATH\u003dnull",
10+
"APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
11+
"NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
12+
"APP_ABI\u003darm64-v8a",
13+
"NDK_ALL_ABIS\u003darm64-v8a",
14+
"NDK_DEBUG\u003d1",
15+
"APP_PLATFORM\u003dandroid-21",
16+
"NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
17+
"NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
18+
"APP_PLATFORM\u003dandroid-21",
19+
"clean"
20+
]
21+
],
22+
"buildTargetsCommandComponents": [
23+
"/home/malik/.android/ndk/21.4.7075529/ndk-build",
24+
"NDK_PROJECT_PATH\u003dnull",
25+
"APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
26+
"NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
27+
"APP_ABI\u003darm64-v8a",
28+
"NDK_ALL_ABIS\u003darm64-v8a",
29+
"NDK_DEBUG\u003d1",
30+
"APP_PLATFORM\u003dandroid-21",
31+
"NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
32+
"NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
33+
"APP_PLATFORM\u003dandroid-21",
34+
"{LIST_OF_TARGETS_TO_BUILD}"
35+
],
36+
"libraries": {
37+
"cpufeatures-debug-arm64-v8a": {
38+
"artifactName": "cpufeatures",
39+
"buildCommandComponents": [
40+
"/home/malik/.android/ndk/21.4.7075529/ndk-build",
41+
"NDK_PROJECT_PATH\u003dnull",
42+
"APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
43+
"NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
44+
"APP_ABI\u003darm64-v8a",
45+
"NDK_ALL_ABIS\u003darm64-v8a",
46+
"NDK_DEBUG\u003d1",
47+
"APP_PLATFORM\u003dandroid-21",
48+
"NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
49+
"NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
50+
"APP_PLATFORM\u003dandroid-21",
51+
"/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libcpufeatures.a"
52+
],
53+
"abi": "arm64-v8a",
54+
"output": "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libcpufeatures.a",
55+
"runtimeFiles": []
56+
},
57+
"openbor-debug-arm64-v8a": {
58+
"artifactName": "openbor",
59+
"buildCommandComponents": [
60+
"/home/malik/.android/ndk/21.4.7075529/ndk-build",
61+
"NDK_PROJECT_PATH\u003dnull",
62+
"APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
63+
"NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
64+
"APP_ABI\u003darm64-v8a",
65+
"NDK_ALL_ABIS\u003darm64-v8a",
66+
"NDK_DEBUG\u003d1",
67+
"APP_PLATFORM\u003dandroid-21",
68+
"NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
69+
"NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
70+
"APP_PLATFORM\u003dandroid-21",
71+
"/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libopenbor.so"
72+
],
73+
"abi": "arm64-v8a",
74+
"output": "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libopenbor.so",
75+
"runtimeFiles": []
76+
}
77+
}
78+
}

‎engine/android/app/.cxx/ndkBuild/debug/arm64-v8a/android_gradle_build_stderr_openbor_arm64-v8a.txt‎

Whitespace-only changes.

0 commit comments

Comments
 (0)