android: added 'universal' flavor that includes both both arm64-v8a and x86_64 versions of libmpd.so

android/app/build.gradle.kts

@@ -57,6 +57,12 @@ android {
                 abiFilters += listOf("x86_64")
             }
         }
+        create("universal") {
+            ndk {
+                // ABI to include in package
+                abiFilters += listOf("arm64-v8a", "x86_64")
+            }
+        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_9

android/build.py

@@ -76,5 +76,7 @@ print("""
 ## To build the android app:
 # cd ../../android
 # ./gradlew assemble{}Debug
+## or, for a universal apk (includes both arm64-v8a and x86_64)
+# ./gradlew assembleUniversalDebug
 -------------------------------------
 """.format(android_abi.capitalize()))

doc/user.rst

@@ -225,8 +225,10 @@ tarball and change into the directory.  Then, instead of
  cd ../../android
  ./gradlew assemble{ABI}Debug
 
-In the argument to `gradlew`, replace `{ABI}` with the build ABI.
+In the argument to `gradlew`, replace `{ABI}` with the build ABI or `Universal`.
 The `productFlavor` names defined in `build.android.kts` match the ABI.
+A universal apk (includes both arm64-v8a and x86_64)
+
 
 :envvar:`SDK_PATH` is the absolute path where you installed the
 Android SDK; :envvar:`NDK_PATH` is the Android NDK installation path;