Measure per-architecture sizes for firebase crashlytics ndk. (#2937)

Author: yifanyang

apk-size/app/build.gradle

@@ -15,7 +15,42 @@
 apply plugin: "com.android.application"
 apply from: "default.gradle"
 android {
-    flavorDimensions "apkSize"
+    flavorDimensions "firebase", "abi"
+
+    // https://developer.android.com/ndk/guides/abis
+    productFlavors {
+        "universal" {
+            dimension "abi"
+        }
+
+        "armeabi-v7a" {
+            dimension "abi"
+            ndk {
+                abiFilters "armeabi-v7a"
+            }
+        }
+
+        "arm64-v8a" {
+            dimension "abi"
+            ndk {
+                abiFilters "arm64-v8a"
+            }
+        }
+
+        "x86" {
+            dimension "abi"
+            ndk {
+                abiFilters "x86"
+            }
+        }
+
+        "x86_64" {
+            dimension "abi"
+            ndk {
+                abiFilters "x86_64"
+            }
+        }
+    }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

apk-size/app/configure.gradle

@@ -26,9 +26,30 @@ if (project.hasProperty('sdks')) {
         sdks.split(',').each { sdk ->
             def (groupId, artifactId, version) = sdk.split(':')
             productFlavors.create(artifactId) {
-                dimension 'apkSize'
+                dimension 'firebase'
             }
             dependencies.add("${artifactId}Implementation", sdk)
         }
+
+        // Ignore debug builds as measurements are not reproducible due to disabled ZipAlign.
+        // Ignore per-architecture builds for all products except for firebase-crashlytics-ndk.
+        variantFilter { variant ->
+            def buildType = variant.buildType.name
+            def flavors = variant.flavors*.name
+            if (buildType == 'debug'
+                    || ('firebase-crashlytics-ndk' in flavors && 'universal' in flavors)
+                    || !('firebase-crashlytics-ndk' in flavors || 'universal' in flavors)) {
+                setIgnore(true)
+            }
+        }
+
+        applicationVariants.all { variant ->
+            def product = variant.productFlavors[0].name
+            def abi = variant.productFlavors[1].name
+            def buildType = variant.buildType.name
+            variant.outputs.all {
+                outputFileName = "${product}::${buildType}::${abi}.apk"
+            }
+        }
     }
 }

apk-size/app/default.gradle

@@ -57,13 +57,6 @@ android {
             shrinkResources false
         }
     }
-
-    variantFilter { variant ->
-        def buildTypeName = variant.buildType*.name
-        if (buildTypeName.contains('debug')) {
-            setIgnore(true)
-        }
-    }
 }
 
 dependencies {

apk-size/app/src/base/base.gradle

@@ -16,7 +16,7 @@
 android {
     productFlavors {
         base {
-            dimension "apkSize"
+            dimension "firebase"
             applicationId "com.google.apksize.base"
         }
     }

apk-size/gradle.properties

@@ -13,5 +13,6 @@
 # limitations under the License.
 
 android.useAndroidX=true
+android.enableJetifier=true
 
 org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=8g

ci/fireci/fireciplugins/binary_size.py

@@ -59,7 +59,7 @@ def binary_size(pull_request, log, metrics_service_url, access_token):
 
   gradle.run('assemble', '--continue', gradle.P('sdks', sdks), workdir='apk-size', check=False)
 
-  test_results = _measure_aar_sizes(artifacts) + _measure_apk_sizes(artifacts)
+  test_results = _measure_aar_sizes(artifacts) + _measure_apk_sizes()
   test_report = {'metric': 'BinarySize', 'results': test_results, 'log': log}
 
   uploader.post_report(test_report, metrics_service_url, access_token)
@@ -79,17 +79,17 @@ def _measure_aar_sizes(artifacts):
   return test_results
 
 
-def _measure_apk_sizes(artifacts):
+def _measure_apk_sizes():
   test_results = []
 
-  for artifact in artifacts:
-    group_id, artifact_id, version = artifact.split(':')
-    apk_files = glob.glob(f'./apk-size/**/{artifact_id}/**/*.apk', recursive=True)
+  apk_files = glob.glob(fr'./apk-size/**/*.apk', recursive=True)
+  for apk_file in apk_files:
+    filename = os.path.basename(apk_file)
+    artifact, build_type, abi = os.path.splitext(filename)[0].split('::')
+    apk_type = build_type if abi == 'universal' else f'{build_type} / {abi}'
+    apk_size = os.path.getsize(apk_file)
 
-    for apk_file in apk_files:
-      build_type = re.search(fr'{artifact_id}/([^/]*)/', apk_file).group(1)
-      apk_size = os.path.getsize(apk_file)
-      test_results.append({'sdk': artifact_id, 'type': f'apk ({build_type})', 'value': apk_size})
+    test_results.append({'sdk': artifact, 'type': f'apk ({apk_type})', 'value': apk_size})
 
   return test_results