Skip to content

Commit 2b9aac9

Browse files
Use proguard-android-optimize.txt for the default ProGuard rules (#7428)
AGP 9 disallows the non-optimized `proguard-android.txt` file (`android.r8.proguardAndroidTxt.disallowed=true` by default). Switching to `proguard-android-optimize.txt` is behavior-neutral here since these modules do not minify (minifyEnabled = false), and aligns the build with the AGP 9 default ahead of an eventual bump.
1 parent 84c240d commit 2b9aac9

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

build-scripts/component-common.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ android {
3030
buildTypes {
3131
release {
3232
minifyEnabled false
33-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
33+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
3434
consumerProguardFiles "$appServicesRootDir/proguard-rules-consumer-jna.pro"
3535
}
3636
}

megazords/full/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
buildTypes {
2222
release {
2323
minifyEnabled false
24-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
24+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2525
consumerProguardFiles "$rootDir/proguard-rules-consumer-jna.pro"
2626
}
2727
}

0 commit comments

Comments
 (0)