diff --git a/android-studio/app/build.gradle b/android-studio/app/build.gradle
index 8022f7029f..68b7d8b2e6 100644
--- a/android-studio/app/build.gradle
+++ b/android-studio/app/build.gradle
@@ -25,6 +25,16 @@ android {
         exclude 'META-INF/LICENSE.txt'
     }
 
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'x86', 'armeabi', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
+            universalApk true
+        }
+    }
+
 }
 
 if (hasProperty('luaRoot')) {
diff --git a/android-studio/app/src/main/AndroidManifest.xml b/android-studio/app/src/main/AndroidManifest.xml
index e76a27d510..f70c0610ef 100644
--- a/android-studio/app/src/main/AndroidManifest.xml
+++ b/android-studio/app/src/main/AndroidManifest.xml
@@ -46,4 +46,6 @@
 
     <uses-feature android:name="android.hardware.screen.landscape" android:required="true" />
     <uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="true" />
+    <uses-feature android:name="android.hardware.type.watch" />
+
 </manifest>
diff --git a/android-studio/libmoai/build.gradle b/android-studio/libmoai/build.gradle
index 9c782f3529..00f9e023ee 100644
--- a/android-studio/libmoai/build.gradle
+++ b/android-studio/libmoai/build.gradle
@@ -15,12 +15,18 @@ android {
             }
         }
         ndk {
-            // Specifies the ABI configurations of your native
-            // libraries Gradle should build and package with your APK.
-            abiFilters 'x86'//, 'x86_64', 'armeabi-v7a'
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a'
 
         }
 
+        splits {
+            abi {
+                enable true
+                reset()
+                include 'x86', 'armeabi', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
+                universalApk true
+            }
+        }
 
     }
     buildTypes {
@@ -34,6 +40,17 @@ android {
             path new File(moaiSdkRoot).canonicalPath + '/cmake/cmake/hosts/host-android/CMakeLists.txt'
         }
     }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
+
+            universalApk true
+        }
+    }
+
 }
 
 dependencies {
diff --git a/src/moai-android/java/build.gradle b/src/moai-android/java/build.gradle
index 1c9485b8e3..4e192a4c1c 100644
--- a/src/moai-android/java/build.gradle
+++ b/src/moai-android/java/build.gradle
@@ -23,6 +23,15 @@ android {
             java.srcDirs += 'src'
         }
     }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'x86', 'armeabi', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
+            universalApk true
+        }
+    }
 }
 
 dependencies {