Skip to content

Commit cbf07d3

Browse files
authored
[AGP 9] Added Proguard File Check (flutter#178191)
Starting AGP 9 the `android.proguard.failOnMissingFiles` flag is set to true by default [here](https://developer.android.com/build/releases/agp-preview#:~:text=change%20is%20required.-,android.proguard.failOnMissingFiles,-Fails%20the%20build). This means that specified proguard files must exist in order for the proguard rules to be configured. Added a check to ensure the file exists. Addresses flutter#175688 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent 909e73e commit cbf07d3

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,15 +265,18 @@ class FlutterPlugin : Plugin<Project> {
265265
// Enables resource shrinking, which is performed by the Android Gradle plugin.
266266
// The resource shrinker can't be used for libraries.
267267
isShrinkResources = FlutterPluginUtils.isBuiltAsApp(project)
268-
// Fallback to `android/app/proguard-rules.pro`.
269-
// This way, custom Proguard rules can be configured as needed.
270268
proguardFiles(
271269
FlutterPluginUtils
272270
.getAndroidExtension(project)
273271
.getDefaultProguardFile("proguard-android-optimize.txt"),
274-
flutterProguardRules,
275-
"proguard-rules.pro"
272+
flutterProguardRules
276273
)
274+
275+
// Optionally adds custom Proguard rules as needed from `android/app/proguard-rules.pro`.
276+
// Starting AGP 9.0 Proguard files must exist to be added to the configuration.
277+
if (File("${project.projectDir}/proguard-rules.pro").exists()) {
278+
proguardFile("proguard-rules.pro")
279+
}
277280
}
278281
}
279282
}

0 commit comments

Comments
 (0)