ashikk
/
kaliber
mirror of https://github.com/auygun/kaliber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Unify arch types in gradle and gn" 

This reverts commit 05252bfae8.
This commit is contained in:
Attila Uygun 2023-09-05 18:04:47 +02:00
parent 5f8f70ed53
commit 0b1220c114
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -41,9 +41,9 @@ cd build/android
./gradlew :app:installHelloWorldAllArchsDebug ./gradlew :app:installHelloWorldAllArchsDebug
``` ```
Build "demo" in debug mode for x86_64 ABI and install. Valid ABI targets are Build "demo" in debug mode for x86_64 ABI and install. Valid ABI targets are
Arm, Arm64, X86, X64, AllArchs, ArmOnly, X86Only. Arm7, Arm8, X86, X86_64, AllArchs, ArmOnly, X86Only.
```text ```text
./gradlew :app:installDemoX64Debug ./gradlew :app:installDemoX86_64Debug
``` ```
### Generate Visual Studio solution: ### Generate Visual Studio solution:

18
build/android/app/build.gradle
View File

@ -17,10 +17,14 @@ abstract class WriteFileTask extends DefaultTask {
} }
class Utils implements Plugin<Project> { class Utils implements Plugin<Project> {
final def ARCH_CODES = ["armeabi-v7a": "Arm", final def ARCH_CODES = ["armeabi-v7a": "Arm7",
"arm64-v8a": "Arm64", "arm64-v8a": "Arm8",
"x86_64": "X64", "x86_64": "X86_64",
"x86": "X86"].asImmutable() "x86": "X86"].asImmutable()
final def GN_CPU_CODES = ["Arm7": "arm",
"Arm8": "arm64",
"X86_64": "x64",
"X86": "x86"].asImmutable()
def project def project
@ -103,7 +107,7 @@ class Utils implements Plugin<Project> {
def generateGnArgsContent(String buildType, String arch) { def generateGnArgsContent(String buildType, String arch) {
def content = 'target_os="android"\n' def content = 'target_os="android"\n'
content += 'target_cpu="' + arch.uncapitalize() + '"\n' content += 'target_cpu="' + GN_CPU_CODES[arch] + '"\n'
content += "is_debug=${buildType != 'Release'}\n" content += "is_debug=${buildType != 'Release'}\n"
content += 'ndk="' + project.android.ndkDirectory + '"\n' content += 'ndk="' + project.android.ndkDirectory + '"\n'
content += "ndk_api=${project.rootProject.ext.minSdk}\n" content += "ndk_api=${project.rootProject.ext.minSdk}\n"
@ -170,13 +174,13 @@ android {
} }
} }
arm { arm7 {
dimension 'arch' dimension 'arch'
ndk { ndk {
abiFilters = ["armeabi-v7a"] abiFilters = ["armeabi-v7a"]
} }
} }
arm64 { arm8 {
dimension 'arch' dimension 'arch'
ndk { ndk {
abiFilters = ["arm64-v8a"] abiFilters = ["arm64-v8a"]
@ -188,7 +192,7 @@ android {
abiFilters = ["x86"] abiFilters = ["x86"]
} }
} }
x64 { x86_64 {
dimension 'arch' dimension 'arch'
ndk { ndk {
abiFilters = ["x86_64"] abiFilters = ["x86_64"]