[AGP 9] Added Proguard File Check (#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 https://github.com/flutter/flutter/issues/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
diff --git a/packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt b/packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt
index a0f3046..9dc036d 100644
--- a/packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt
+++ b/packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt
@@ -265,15 +265,18 @@
// Enables resource shrinking, which is performed by the Android Gradle plugin.
// The resource shrinker can't be used for libraries.
isShrinkResources = FlutterPluginUtils.isBuiltAsApp(project)
- // Fallback to `android/app/proguard-rules.pro`.
- // This way, custom Proguard rules can be configured as needed.
proguardFiles(
FlutterPluginUtils
.getAndroidExtension(project)
.getDefaultProguardFile("proguard-android-optimize.txt"),
- flutterProguardRules,
- "proguard-rules.pro"
+ flutterProguardRules
)
+
+ // Optionally adds custom Proguard rules as needed from `android/app/proguard-rules.pro`.
+ // Starting AGP 9.0 Proguard files must exist to be added to the configuration.
+ if (File("${project.projectDir}/proguard-rules.pro").exists()) {
+ proguardFile("proguard-rules.pro")
+ }
}
}
}
