From e8970f189c6f173460d8deba913144ab35307717 Mon Sep 17 00:00:00 2001
From: Khosraw Azizi <khosraw.azizi@gmail.com>
Date: Sat, 5 Nov 2022 15:42:38 -0500
Subject: [PATCH] made recommended changes to gradle configuration

---
 TeamCode/build.gradle                 | 13 ++++++++-----
 TeamCode/src/main/AndroidManifest.xml |  2 +-
 build.common.gradle                   |  3 ---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/TeamCode/build.gradle b/TeamCode/build.gradle
index a21264b..d19141d 100644
--- a/TeamCode/build.gradle
+++ b/TeamCode/build.gradle
@@ -20,12 +20,15 @@ android {
             jniLibs.srcDirs = ['libs']
         }
     }
-
-    aaptOptions {
-        noCompress 'tflite'
-    }
     packagingOptions {
-        pickFirsts += ['**/*.so']
+        jniLibs {
+            pickFirsts += ['**/*.so']
+        }
+    }
+
+    namespace 'org.firstinspires.ftc.teamcode'
+    androidResources {
+        noCompress 'tflite'
     }
 }
 
diff --git a/TeamCode/src/main/AndroidManifest.xml b/TeamCode/src/main/AndroidManifest.xml
index 626405c..87b7178 100644
--- a/TeamCode/src/main/AndroidManifest.xml
+++ b/TeamCode/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
      So it won't ultimately be as empty as it might here appear to be :-) -->
 
 <!-- The package name here determines the package for your R class and your BuildConfig class -->
-<manifest package="org.firstinspires.ftc.teamcode">
+<manifest>
 
     <application />
 </manifest>
diff --git a/build.common.gradle b/build.common.gradle
index 1a78640..08a5b97 100644
--- a/build.common.gradle
+++ b/build.common.gradle
@@ -47,9 +47,6 @@ android {
         }
     }
 
-    aaptOptions {
-        noCompress "tflite"
-    }
 
     defaultConfig {
         signingConfig signingConfigs.debug