Added ability to build ARMv7a and ARMv8a APKs separately

abdalmoniem · May 12, 2020 · 552cef1 · 552cef1
1 parent c3b70f7
commit 552cef1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -82,9 +82,9 @@ def renameOutputFiles(Project project, variant) {
 
         // Customise APK filenames
         if (outputFileName.contains("debug")) {
-            output.outputFileName = outputFileName.replace("debug", "development").replace(".apk", "-" + (System.getenv("BUILD_NUMBER") ?: "local") + ".apk")
+            output.outputFileName = project.parent.name.toLowerCase() + "-" + outputFileName.replace("debug", "development").replace(".apk", "-" + (System.getenv("BUILD_NUMBER") ?: "local") + ".apk")
         } else {
-            output.outputFileName = outputFileName.replace(".apk", "-" + variant.versionName + ".apk")
+            output.outputFileName = project.parent.name.toLowerCase() + "-" + outputFileName.replace(".apk", "-" + variant.versionName + ".apk")
         }
     }
 }
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -7,7 +7,7 @@ android {
     def buildNumber = (System.getenv("BUILD_NUMBER") ?: 1) as int
 
     defaultConfig {
-        applicationId "pct.droid"
+        applicationId "com.hifnawy.movie.app.mobile"
         minSdkVersion rootProject.ext.minSdk
         targetSdkVersion rootProject.ext.targetSdk
         versionCode buildNumber
@@ -37,12 +37,20 @@ android {
 
     flavorDimensions 'platform'
     productFlavors {
-        arm {
+        armeabi_v7 {
             dimension 'platform'
             ndk {
-                abiFilters "arm64-v8a", "armeabi-v7a"
+                abiFilters "armeabi-v7a"
             }
         }
+
+        arm64_v8a {
+            dimension 'platform'
+            ndk {
+                abiFilters "arm64-v8a"
+            }
+        }
+
         x86 {
             dimension 'platform'
             ndk {

diff --git a/mobile/src/main/java/butter/droid/fragments/MovieDetailFragment.java b/mobile/src/main/java/butter/droid/fragments/MovieDetailFragment.java
@@ -258,13 +258,10 @@ public void onFailure(Exception e) {
                 SortUtils.sortQualities(qualities);
 
                 mQuality.setData(qualities);
-                mQuality.setListener(new OptionSelector.SelectorListener() {
-                    @Override
-                    public void onSelectionChanged(int position, String value) {
-                        mSelectedQuality = value;
-                        renderHealth();
-                        updateMagnet();
-                    }
+                mQuality.setListener((position, value) -> {
+                    mSelectedQuality = value;
+                    renderHealth();
+                    updateMagnet();
                 });
 
                 String quality = DefaultQuality.get(mActivity, Arrays.asList(qualities));

diff --git a/tv/build.gradle b/tv/build.gradle
@@ -7,7 +7,7 @@ android {
     def buildNumber = (System.getenv("BUILD_NUMBER") ?: 1) as int
 
     defaultConfig {
-        applicationId "pct.droid.tv"
+        applicationId "com.hifnawy.movie.app.tv"
         minSdkVersion 21
         targetSdkVersion rootProject.ext.targetSdk
         versionCode buildNumber
@@ -38,12 +38,20 @@ android {
 
     flavorDimensions 'platform'
     productFlavors {
-        arm {
+        armeabi_v7 {
             dimension 'platform'
             ndk {
-                abiFilters "arm64-v8a", "armeabi-v7a"
+                abiFilters "armeabi-v7a"
             }
         }
+
+        arm64_v8a {
+            dimension 'platform'
+            ndk {
+                abiFilters "arm64-v8a"
+            }
+        }
+
         x86 {
             dimension 'platform'
             ndk {