Browse Source

Apply recommended changes by Android Studio.

Miku AuahDark 2 years ago
parent
commit
349c1e3dda

+ 2 - 1
app/build.gradle

@@ -3,6 +3,7 @@ import java.nio.charset.StandardCharsets
 apply plugin: 'com.android.application'
 apply plugin: 'com.android.application'
 
 
 android {
 android {
+    namespace "org.love2d.android.executable"
     compileSdk 33
     compileSdk 33
     buildToolsVersion '33.0.0'
     buildToolsVersion '33.0.0'
     ndkVersion '23.2.8568313'
     ndkVersion '23.2.8568313'
@@ -58,7 +59,7 @@ android {
             dimension 'recording'
             dimension 'recording'
         }
         }
     }
     }
-    lintOptions {
+    lint {
         abortOnError false
         abortOnError false
     }
     }
 }
 }

+ 1 - 3
app/src/main/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    package="org.love2d.android.executable"
-    xmlns:android="http://schemas.android.com/apk/res/android" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.VIBRATE" />
   <uses-permission android:name="android.permission.VIBRATE" />
   <uses-permission android:name="android.permission.BLUETOOTH" />
   <uses-permission android:name="android.permission.BLUETOOTH" />

+ 1 - 3
app/src/norecord/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-  package="org.love2d.android.executable"
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   xmlns:tools="http://schemas.android.com/tools"
 >
 >
   <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove" />
   <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove" />

+ 1 - 3
app/src/normal/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    package="org.love2d.android.executable"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" >
     xmlns:tools="http://schemas.android.com/tools" >
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" tools:replace="maxSdkVersion" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" tools:replace="maxSdkVersion" />

+ 7 - 5
love/build.gradle

@@ -9,6 +9,7 @@ android {
     compileSdkVersion 33
     compileSdkVersion 33
     buildToolsVersion '33.0.0'
     buildToolsVersion '33.0.0'
     ndkVersion '23.2.8568313'
     ndkVersion '23.2.8568313'
+    namespace "org.love2d.android"
 
 
     defaultConfig {
     defaultConfig {
         compileSdkVersion 33
         compileSdkVersion 33
@@ -100,12 +101,13 @@ android {
             path 'src/jni/Android.mk'
             path 'src/jni/Android.mk'
         }
         }
     }
     }
-    lintOptions {
-        abortOnError false
-    }
     packagingOptions {
     packagingOptions {
-        exclude 'lib/arm64-v8a/libSDL2.so'
-        exclude 'lib/armeabi-v7a/libSDL2.so'
+        jniLibs {
+            excludes += ['lib/arm64-v8a/libSDL2.so', 'lib/armeabi-v7a/libSDL2.so']
+        }
+    }
+    lint {
+        abortOnError false
     }
     }
 }
 }
 
 

+ 1 - 1
love/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.love2d.android" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
 </manifest>
 </manifest>