diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index ae34d82377..c47c00a1a4 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -29,6 +29,7 @@ android { } } + // Define build types, which are orthogonal to product flavors. buildTypes { // Signed by release key, allowing for upload to Play Store. release { @@ -43,6 +44,35 @@ android { jniDebuggable true } } + + // Define product flavors, which can be split into categories. Common examples + // of product flavors are paid vs. free, ARM vs. x86, etc. + productFlavors { + arm { + // This flavor is mutually exclusive against any flavor in the same dimension. + flavorDimension "abi" + + // When building this flavor, only include native libs from the specified folder. + ndk { + abiFilter "armeabi-v7a" + } + } + + arm_64 { + flavorDimension "abi" + ndk { + abiFilter "arm64-v8a" + } + } + + // TODO Uncomment this when we successfully build for x86_64. + /*x86_64 { + flavorDimension "abi" + ndk { + abiFilter "x86_64" + } + }*/ + } } dependencies { diff --git a/Source/Android/app/src/arm/res/values/strings.xml b/Source/Android/app/src/arm/res/values/strings.xml new file mode 100644 index 0000000000..ec82295355 --- /dev/null +++ b/Source/Android/app/src/arm/res/values/strings.xml @@ -0,0 +1,5 @@ + + + + Dolphin ARM32 + \ No newline at end of file diff --git a/Source/Android/app/src/arm_64/res/values/strings.xml b/Source/Android/app/src/arm_64/res/values/strings.xml new file mode 100644 index 0000000000..c98efb06b6 --- /dev/null +++ b/Source/Android/app/src/arm_64/res/values/strings.xml @@ -0,0 +1,5 @@ + + + + Dolphin ARM64 + \ No newline at end of file diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml index 9042094c43..6bbb272dc3 100644 --- a/Source/Android/app/src/main/AndroidManifest.xml +++ b/Source/Android/app/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 99defca7bf..80f5d6feae 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -220,6 +220,8 @@ Disabled Other + + Dolphin New UI Add Folder to Library Up one level diff --git a/Source/Android/app/src/x86_64/res/values/strings.xml b/Source/Android/app/src/x86_64/res/values/strings.xml new file mode 100644 index 0000000000..ec82295355 --- /dev/null +++ b/Source/Android/app/src/x86_64/res/values/strings.xml @@ -0,0 +1,5 @@ + + + + Dolphin ARM32 + \ No newline at end of file