Browse Source

Move package declarations to build.gradle

Requested by AGP upgrade and also is crashing test builds

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 years ago
parent
commit
9a0848e486

+ 5 - 0
app/build.gradle

@@ -73,6 +73,11 @@ android {
     // install this NDK version and Cmake to produce smaller APKs. Build will still work if not installed
     ndkVersion "${ndkEnv.get("NDK_VERSION")}"
 
+
+    namespace 'com.owncloud.android'
+    testNamespace "${namespace}.test"
+
+
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 30

+ 0 - 1
app/src/androidTest/AndroidManifest.xml

@@ -26,7 +26,6 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="${applicationId}.test"
     android:sharedUserId="${applicationId}.uid">
 
 </manifest>

+ 1 - 2
app/src/gplay/AndroidManifest.xml

@@ -17,8 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.owncloud.android">
+          xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".MainApp"

+ 1 - 2
app/src/huawei/AndroidManifest.xml

@@ -19,8 +19,7 @@
   along with this program. If not, see <https://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.owncloud.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".MainApp"

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

@@ -18,8 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.owncloud.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />