From 9113f87e1e548e8d9574a012b3d704a20be15a4a Mon Sep 17 00:00:00 2001
From: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
Date: Mon, 1 Sep 2025 12:03:38 +0000
Subject: [PATCH] Strip all AGP version data from APKs (#10355)

---
 common.gradle | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/common.gradle b/common.gradle
index b8e4fb05a..ddb630103 100644
--- a/common.gradle
+++ b/common.gradle
@@ -80,11 +80,6 @@ android {
         resources.excludes.add("kotlin-tooling-metadata.json")
     }
 
-    // https://stackoverflow.com/a/77745844
-    tasks.withType(com.android.build.gradle.tasks.PackageAndroidArtifact).configureEach {
-        doFirst { appMetadata.asFile.getOrNull()?.write('') }
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -126,6 +121,15 @@ tasks.register("writeManifestFile") {
     }
 }
 
+afterEvaluate {
+    tasks.withType(com.android.build.gradle.tasks.PackageAndroidArtifact).configureEach {
+        // need to be in afterEvaluate to overwrite default value
+        createdBy = ""
+        // https://stackoverflow.com/a/77745844
+        doFirst { appMetadata.asFile.getOrNull()?.write('') }
+    }
+}
+
 preBuild.dependsOn(writeManifestFile, lintKotlin)
 if (System.getenv("CI") != "true") {
     lintKotlin.dependsOn(formatKotlin)