diff --git a/engine/android/-local.properties b/engine/android/-local.properties new file mode 100644 index 000000000..e802e6f6b --- /dev/null +++ b/engine/android/-local.properties @@ -0,0 +1,2 @@ +sdk.dir=/home/malik/.android +ndk.dir=/home/malik/.android/ndk-bundle diff --git a/engine/android/app/.cxx/abi_configuration_3b6j5l4y.json b/engine/android/app/.cxx/abi_configuration_3b6j5l4y.json new file mode 100644 index 000000000..52eb38a73 --- /dev/null +++ b/engine/android/app/.cxx/abi_configuration_3b6j5l4y.json @@ -0,0 +1,10 @@ +{ + "allAbis": [ + "armeabi-v7a", + "arm64-v8a" + ], + "validAbis": [ + "ARMEABI_V7A", + "ARM64_V8A" + ] +} \ No newline at end of file diff --git a/engine/android/app/.cxx/abi_configuration_3b6j5l4y.log b/engine/android/app/.cxx/abi_configuration_3b6j5l4y.log new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/engine/android/app/.cxx/abi_configuration_3b6j5l4y.log @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/engine/android/app/.cxx/abi_configuration_3b6j5l4y_key.json b/engine/android/app/.cxx/abi_configuration_3b6j5l4y_key.json new file mode 100644 index 000000000..709066f1b --- /dev/null +++ b/engine/android/app/.cxx/abi_configuration_3b6j5l4y_key.json @@ -0,0 +1,21 @@ +{ + "ndkHandlerSupportedAbis": [ + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" + ], + "ndkHandlerDefaultAbis": [ + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" + ], + "externalNativeBuildAbiFilters": [ + "armeabi-v7a", + "arm64-v8a" + ], + "ndkConfigAbiFilters": [], + "splitsFilterAbis": [], + "ideBuildOnlyTargetAbi": true +} \ No newline at end of file diff --git a/engine/android/app/.cxx/ndk_locator_record_4w44q421.json b/engine/android/app/.cxx/ndk_locator_record_4w44q421.json new file mode 100644 index 000000000..3e1f6e2a8 --- /dev/null +++ b/engine/android/app/.cxx/ndk_locator_record_4w44q421.json @@ -0,0 +1,11 @@ +{ + "ndk": "/home/malik/.android/ndk/21.1.6352462", + "revision": { + "mMajor": 21, + "mMinor": 1, + "mMicro": 6352462, + "mPreview": 0, + "mPrecision": "MICRO", + "mPreviewSeparator": " " + } +} \ No newline at end of file diff --git a/engine/android/app/.cxx/ndk_locator_record_4w44q421.log b/engine/android/app/.cxx/ndk_locator_record_4w44q421.log new file mode 100644 index 000000000..d7cadb3c7 --- /dev/null +++ b/engine/android/app/.cxx/ndk_locator_record_4w44q421.log @@ -0,0 +1,42 @@ +[ + { + "level": "INFO", + "message": "android.ndkVersion from module build.gradle is [not set]" + }, + { + "level": "INFO", + "message": "android.ndkPath from module build.gradle is not set" + }, + { + "level": "INFO", + "message": "ndk.dir in local.properties is not set" + }, + { + "level": "INFO", + "message": "Not considering ANDROID_NDK_HOME because support was removed after deprecation period." + }, + { + "level": "INFO", + "message": "sdkFolder is /home/malik/.android" + }, + { + "level": "INFO", + "message": "NDK side-by-side folder from sdkFolder /home/malik/.android/ndk does not exist" + }, + { + "level": "INFO", + "message": "Because no explicit NDK was requested, the default version [21.1.6352462] for this Android Gradle Plugin will be used" + }, + { + "level": "INFO", + "message": "Folder /home/malik/.android/ndk/21.1.6352462 does not exist. Ignoring." + }, + { + "level": "INFO", + "message": "No NDK was found. Trying to download it now." + }, + { + "level": "INFO", + "message": "NDK 21.1.6352462 was downloaded to /home/malik/.android/ndk/21.1.6352462. Using that." + } +] \ No newline at end of file diff --git a/engine/android/app/.cxx/ndk_locator_record_4w44q421_key.json b/engine/android/app/.cxx/ndk_locator_record_4w44q421_key.json new file mode 100644 index 000000000..5f1548e8c --- /dev/null +++ b/engine/android/app/.cxx/ndk_locator_record_4w44q421_key.json @@ -0,0 +1,4 @@ +{ + "sdkFolder": "/home/malik/.android", + "sideBySideNdkFolderNames": [] +} \ No newline at end of file diff --git a/engine/android/app/.cxx/ndk_locator_record_652t305s.json b/engine/android/app/.cxx/ndk_locator_record_652t305s.json new file mode 100644 index 000000000..3e1f6e2a8 --- /dev/null +++ b/engine/android/app/.cxx/ndk_locator_record_652t305s.json @@ -0,0 +1,11 @@ +{ + "ndk": "/home/malik/.android/ndk/21.1.6352462", + "revision": { + "mMajor": 21, + "mMinor": 1, + "mMicro": 6352462, + "mPreview": 0, + "mPrecision": "MICRO", + "mPreviewSeparator": " " + } +} \ No newline at end of file diff --git a/engine/android/app/.cxx/ndk_locator_record_652t305s.log b/engine/android/app/.cxx/ndk_locator_record_652t305s.log new file mode 100644 index 000000000..7fda12577 --- /dev/null +++ b/engine/android/app/.cxx/ndk_locator_record_652t305s.log @@ -0,0 +1,26 @@ +[ + { + "level": "INFO", + "message": "android.ndkVersion from module build.gradle is [not set]" + }, + { + "level": "INFO", + "message": "android.ndkPath from module build.gradle is not set" + }, + { + "level": "INFO", + "message": "ndk.dir in local.properties is not set" + }, + { + "level": "INFO", + "message": "Not considering ANDROID_NDK_HOME because support was removed after deprecation period." + }, + { + "level": "INFO", + "message": "sdkFolder is /home/malik/.android" + }, + { + "level": "INFO", + "message": "Because no explicit NDK was requested, the default version [21.1.6352462] for this Android Gradle Plugin will be used" + } +] \ No newline at end of file diff --git a/engine/android/app/.cxx/ndk_locator_record_652t305s_key.json b/engine/android/app/.cxx/ndk_locator_record_652t305s_key.json new file mode 100644 index 000000000..c893793cb --- /dev/null +++ b/engine/android/app/.cxx/ndk_locator_record_652t305s_key.json @@ -0,0 +1,6 @@ +{ + "sdkFolder": "/home/malik/.android", + "sideBySideNdkFolderNames": [ + "21.1.6352462" + ] +} \ No newline at end of file diff --git a/engine/android/app/build.gradle b/engine/android/app/build.gradle index f42ebe2e8..b605a404c 100644 --- a/engine/android/app/build.gradle +++ b/engine/android/app/build.gradle @@ -7,6 +7,7 @@ android { targetSdkVersion 31 //////////// MODFY FOR CUSTOM APK ///////////////// + namespace "org.openbor.engine" applicationId "org.openbor.engine" versionCode 1 versionName "1.0.0" diff --git a/engine/android/app/src/main/AndroidManifest.xml b/engine/android/app/src/main/AndroidManifest.xml index fad25eb92..466616c91 100644 --- a/engine/android/app/src/main/AndroidManifest.xml +++ b/engine/android/app/src/main/AndroidManifest.xml @@ -1,13 +1,12 @@ - + diff --git a/engine/android/build.gradle b/engine/android/build.gradle index ae9fbafb9..af8c1a65c 100644 --- a/engine/android/build.gradle +++ b/engine/android/build.gradle @@ -2,11 +2,11 @@ buildscript { repositories { - jcenter() + mavenCentral() google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:7.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,7 +15,7 @@ buildscript { allprojects { repositories { - jcenter() + mavenCentral() google() } } diff --git a/engine/android/build.sh b/engine/android/build.sh index 075f2e278..89df5b429 100755 --- a/engine/android/build.sh +++ b/engine/android/build.sh @@ -47,7 +47,9 @@ then fi #set build version, android home temp variable and build -export ANDROID_SDK_ROOT=~/.android + +export ANDROID_HOME=~/.android +export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle cd $(dirname $(readlink -f $0)) cd ../ ./version.sh diff --git a/engine/android/gradle/wrapper/gradle-wrapper.properties b/engine/android/gradle/wrapper/gradle-wrapper.properties index f9b3be2f9..90154a43f 100644 --- a/engine/android/gradle/wrapper/gradle-wrapper.properties +++ b/engine/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip diff --git a/engine/version.tmp b/engine/version.tmp new file mode 100644 index 000000000..a8b4617ab --- /dev/null +++ b/engine/version.tmp @@ -0,0 +1,20 @@ +/* + * OpenBOR - http://www.ChronoCrash.com + * ----------------------------------------------------------------------- + * All rights reserved, see LICENSE in OpenBOR root for details. + * + * Copyright (c) OpenBOR Team + */ + +#ifndef VERSION_H +#define VERSION_H + +#define VERSION_NAME "OpenBOR" +#define VERSION_MAJOR "4" +#define VERSION_MINOR "0" +#define VERSION_BUILD "7728" +#define VERSION_BUILD_INT 7728 +#define VERSION_COMMIT "2e2519b" +#define VERSION "v"VERSION_MAJOR"."VERSION_MINOR" Build "VERSION_BUILD" (commit hash: "VERSION_COMMIT")" + +#endif diff --git a/engine/version.txt b/engine/version.txt new file mode 100644 index 000000000..6788f1c93 --- /dev/null +++ b/engine/version.txt @@ -0,0 +1 @@ +OpenBOR-v4.0.7728-2e2519b