Working on TCC...

3 files changed, 61 insertions, 44 deletions

diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle
index 8a0752b39..3aa149370 100644
--- a/Software/Android_Studio/ColorCapture/app/build.gradle
+++ b/Software/Android_Studio/ColorCapture/app/build.gradle
@@ -52,63 +52,80 @@ android {
         }
     }
 
-    splits {
+//    splits {
+//
+//        // Configures multiple APKs based on ABI.
+//        abi {
+//
+//            // Enables building multiple APKs per ABI.
+//            enable true
+//
+//            // By default all ABIs are included, so use reset() and include to specify that we only
+//            // want APKs for x86 and x86_64.
+//
+//            // Resets the list of ABIs that Gradle should create APKs for to none.
+//            reset()
+//
+//            // Specifies a list of ABIs that Gradle should create APKs for.
+//            include "armeabi-v7a", "arm64-v8a", "x86"
+//
+//            // Specifies that we do not want to also generate a universal APK that includes all ABIs.
+//            universalApk false
+//        }
+//    }
 
-        // Configures multiple APKs based on ABI.
+    // Add this block and enable/disable the parameters as follows
+    bundle {
+        density {
+            // Different APKs are generated for devices with different screen densities; true by default.
+            enableSplit false
+        }
         abi {
-
-            // Enables building multiple APKs per ABI.
-            enable true
-
-            // By default all ABIs are included, so use reset() and include to specify that we only
-            // want APKs for x86 and x86_64.
-
-            // Resets the list of ABIs that Gradle should create APKs for to none.
-            reset()
-
-            // Specifies a list of ABIs that Gradle should create APKs for.
-            include "armeabi-v7a", "arm64-v8a", "x86"
-
-            // Specifies that we do not want to also generate a universal APK that includes all ABIs.
-            universalApk false
+            // Different APKs are generated for devices with different CPU architectures; true by default.
+            enableSplit true
+        }
+        language {
+            // This is disabled so that the App Bundle does NOT split the APK for each language.
+            // We're gonna use the same APK for all languages.
+            enableSplit false
         }
     }
 }
 
 // Map for the version code that gives each ABI a value.
-ext.abiCodes = ['armeabi-v7a':1, 'arm64-v8a':2, 'x86':3]
+//ext.abiCodes = ['armeabi-v7a':1, 'arm64-v8a':2, 'x86':3]
 
-import com.android.build.OutputFile
+//import com.android.build.OutputFile
 
 // For each APK output variant, override versionCode with a combination of
 // ext.abiCodes * 1000 + variant.versionCode. In this example, variant.versionCode
 // is equal to defaultConfig.versionCode. If you configure product flavors that
 // define their own versionCode, variant.versionCode uses that value instead.
-android.applicationVariants.all { variant ->
-
-    // Assigns a different version code for each output APK
-    // other than the universal APK.
-    variant.outputs.each { output ->
-
-        // Stores the value of ext.abiCodes that is associated with the ABI for this variant.
-        def baseAbiVersionCode =
-                // Determines the ABI for this variant and returns the mapped value.
-                project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
-
-        // Because abiCodes.get() returns null for ABIs that are not mapped by ext.abiCodes,
-        // the following code does not override the version code for universal APKs.
-        // However, because we want universal APKs to have the lowest version code,
-        // this outcome is desirable.
-        if (baseAbiVersionCode != null) {
-
-            // Assigns the new version code to versionCodeOverride, which changes the version code
-            // for only the output APK, not for the variant itself. Skipping this step simply
-            // causes Gradle to use the value of variant.versionCode for the APK.
-            output.versionCodeOverride =
-                    baseAbiVersionCode * 1000 + variant.versionCode
-        }
-    }
-}
+//android.applicationVariants.all { variant ->
+//
+//    // Assigns a different version code for each output APK
+//    // other than the universal APK.
+//    variant.outputs.each { output ->
+//
+//        // Stores the value of ext.abiCodes that is associated with the ABI for this variant.
+//        def baseAbiVersionCode =
+//                // Determines the ABI for this variant and returns the mapped value.
+//                project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+//
+//        // Because abiCodes.get() returns null for ABIs that are not mapped by ext.abiCodes,
+//        // the following code does not override the version code for universal APKs.
+//        // However, because we want universal APKs to have the lowest version code,
+//        // this outcome is desirable.
+//        if (baseAbiVersionCode != null) {
+//
+//            // Assigns the new version code to versionCodeOverride, which changes the version code
+//            // for only the output APK, not for the variant itself. Skipping this step simply
+//            // causes Gradle to use the value of variant.versionCode for the APK.
+//            output.versionCodeOverride =
+//                    baseAbiVersionCode * 1000 + variant.versionCode
+//        }
+//    }
+//}
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
diff --git a/Software/Android_Studio/KeyStore/private_key.pepk b/Software/Android_Studio/KeyStore/private_key.pepk
new file mode 100644
index 000000000..a714f2044
--- /dev/null
+++ b/Software/Android_Studio/KeyStore/private_key.pepk
diff --git a/Software/Android_Studio/KeyStore/tcc_key.jks b/Software/Android_Studio/KeyStore/tcc_key.jks
new file mode 100644
index 000000000..f0197550f
--- /dev/null
+++ b/Software/Android_Studio/KeyStore/tcc_key.jks