From 9114acc5e1479b5de41adf05e7e8f13e670c17d4 Mon Sep 17 00:00:00 2001 From: vibhor-kulshrestha Date: Wed, 22 Apr 2026 16:42:15 +0530 Subject: [PATCH 1/4] fix: resolve baseline profile generation failures --- app/build.gradle.kts | 9 +++++++++ benchmarks/build.gradle.kts | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2f02539435..7f826bab3e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -150,3 +150,12 @@ baselineProfile { dependencyGuard { configuration("prodReleaseRuntimeClasspath") } + +tasks.configureEach { + if (name == "createProdNonMinifiedReleaseApkListingFileRedirect") { + val benchmarksProject = project.rootProject.findProject(":benchmarks") + benchmarksProject?.tasks?.matching { + it.name.contains("packageProdNonMinifiedRelease") + }?.let { dependsOn(it) } + } +} \ No newline at end of file diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 258993913f..67b053ec62 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -26,7 +26,7 @@ android { defaultConfig { minSdk = 28 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - + testInstrumentationRunnerArguments["androidx.benchmark.enabledRules"] = "BaselineProfile" buildConfigField("String", "APP_BUILD_TYPE_SUFFIX", "\"\"") } From a15f8041bd39f3e99bf58a39c9a3f5375974bedf Mon Sep 17 00:00:00 2001 From: vibhor-kulshrestha Date: Wed, 22 Apr 2026 16:49:10 +0530 Subject: [PATCH 2/4] fix: add missing newline at end of file --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7f826bab3e..45a284bd7e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -158,4 +158,4 @@ tasks.configureEach { it.name.contains("packageProdNonMinifiedRelease") }?.let { dependsOn(it) } } -} \ No newline at end of file +} From 9d80cc47bddebe4f65a5b8fea63245eb309f424a Mon Sep 17 00:00:00 2001 From: vibhor-kulshrestha Date: Wed, 22 Apr 2026 17:02:37 +0530 Subject: [PATCH 3/4] fix: address bot review feedback - improve task config efficiency and scope enabledRules to nonMinifiedRelease build type --- app/build.gradle.kts | 15 ++++++++------- benchmarks/build.gradle.kts | 7 +++++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 45a284bd7e..93e9d8b183 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -151,11 +151,12 @@ dependencyGuard { configuration("prodReleaseRuntimeClasspath") } -tasks.configureEach { - if (name == "createProdNonMinifiedReleaseApkListingFileRedirect") { - val benchmarksProject = project.rootProject.findProject(":benchmarks") - benchmarksProject?.tasks?.matching { - it.name.contains("packageProdNonMinifiedRelease") - }?.let { dependsOn(it) } - } +val benchmarksProject = rootProject.findProject(":benchmarks") +if (benchmarksProject != null) { + tasks.matching { it.name == "createProdNonMinifiedReleaseApkListingFileRedirect" } + .configureEach { + dependsOn(benchmarksProject.tasks.matching { + it.name.contains("packageProdNonMinifiedRelease") + }) + } } diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 67b053ec62..037e8866e6 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -26,10 +26,13 @@ android { defaultConfig { minSdk = 28 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - testInstrumentationRunnerArguments["androidx.benchmark.enabledRules"] = "BaselineProfile" buildConfigField("String", "APP_BUILD_TYPE_SUFFIX", "\"\"") } - + buildTypes { + create("nonMinifiedRelease") { + defaultConfig.testInstrumentationRunnerArguments["androidx.benchmark.enabledRules"] = "BaselineProfile" + } + } buildFeatures { buildConfig = true } From bede1ca41c943a876f16e7b864207f3b6feba832 Mon Sep 17 00:00:00 2001 From: vibhor-kulshrestha Date: Wed, 22 Apr 2026 17:30:08 +0530 Subject: [PATCH 4/4] fix: revert enabledRules to defaultConfig - scoping to buildType breaks variant resolution --- benchmarks/build.gradle.kts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 037e8866e6..67b053ec62 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -26,13 +26,10 @@ android { defaultConfig { minSdk = 28 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunnerArguments["androidx.benchmark.enabledRules"] = "BaselineProfile" buildConfigField("String", "APP_BUILD_TYPE_SUFFIX", "\"\"") } - buildTypes { - create("nonMinifiedRelease") { - defaultConfig.testInstrumentationRunnerArguments["androidx.benchmark.enabledRules"] = "BaselineProfile" - } - } + buildFeatures { buildConfig = true }