Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unnecessary -keep rule for AndroidDispatcherFactory, AndroidEx… #3263

Merged
merged 2 commits into from May 18, 2022
Merged

Remove unnecessary -keep rule for AndroidDispatcherFactory, AndroidEx… #3263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ececff
Remove unnecessary -keep rule for AndroidDispatcherFactory, AndroidEx…
agrieve Apr 21, 2022
0c8d842
Update the comments in proguard files to reflect the new structure
dkhalanskyjb May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ui/kotlinx-coroutines-android/resources/META-INF/com.android.tools/proguard/coroutines.pro
View file
Open in desktop
@@ -1,5 +1,6 @@
# When editing this file, update the following files as well:
# - META-INF/com.android.tools/r8-upto-1.6.0/coroutines.pro
# - META-INF/com.android.tools/r8-upto-3.0.0/coroutines.pro
# - META-INF/proguard/coroutines.pro

-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
-keep class kotlinx.coroutines.android.AndroidExceptionPreHandler {*;}
4 changes: 1 addition & 3 deletions ...linx-coroutines-android/resources/META-INF/com.android.tools/r8-from-1.6.0/coroutines.pro
View file
Open in desktop
Expand Up @@ -9,8 +9,6 @@
boolean ANDROID_DETECTED return true;
}

-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}

# Disable support for "Missing Main Dispatcher", since we always have Android main dispatcher
-assumenosideeffects class kotlinx.coroutines.internal.MainDispatchersKt {
boolean SUPPORT_MISSING return false;
Expand All @@ -21,4 +19,4 @@
boolean getASSERTIONS_ENABLED() return false;
boolean getDEBUG() return false;
boolean getRECOVER_STACK_TRACES() return false;
}
}
9 changes: 0 additions & 9 deletions ...linx-coroutines-android/resources/META-INF/com.android.tools/r8-upto-1.6.0/coroutines.pro
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions ...linx-coroutines-android/resources/META-INF/com.android.tools/r8-upto-3.0.0/coroutines.pro
View file
Open in desktop
@@ -0,0 +1,10 @@
# When editing this file, update the following files as well for AGP 3.6.0+:
# - META-INF/com.android.tools/proguard/coroutines.pro
# - META-INF/proguard/coroutines.pro

# After R8 3.0.0 (or probably sometime before that), R8 learned how to optimize
# classes mentioned in META-INF/services files, and explicitly -keeping them
# disables these optimizations.
# https://github.com/Kotlin/kotlinx.coroutines/issues/3111
-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
-keep class kotlinx.coroutines.android.AndroidExceptionPreHandler {*;}
3 changes: 2 additions & 1 deletion ui/kotlinx-coroutines-android/resources/META-INF/proguard/coroutines.pro
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@

# When editing this file, update the following files as well for AGP 3.6.0+:
# - META-INF/com.android.tools/proguard/coroutines.pro
# - META-INF/com.android.tools/r8-upto-1.6.0/coroutines.pro
# - META-INF/com.android.tools/r8-upto-3.0.0/coroutines.pro

-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
-keep class kotlinx.coroutines.android.AndroidExceptionPreHandler {*;}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this change should also be in META-INF/com.android.tools/proguard/coroutines.pro.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doh! Done.

Do you know why in r8-from-1.6.0 there is:

-assumenosideeffects class kotlinx.coroutines.internal.FastServiceLoaderKt {
    boolean ANDROID_DETECTED return true;
}

but in r8-upto-1.6.0 there is:

-assumenosideeffects class kotlinx.coroutines.internal.FastServiceLoader {
    boolean ANDROID_DETECTED return true;
}

E.g. Maybe R8 applied these rules in an odd way before 1.6, or maybe the rule is just wrong in the upto-1.6.0 file (and the file should be deleted).

2 changes: 0 additions & 2 deletions ui/kotlinx-coroutines-android/src/AndroidExceptionPreHandler.kt
View file
Open in desktop
Expand Up @@ -5,12 +5,10 @@
package kotlinx.coroutines.android

import android.os.*
import androidx.annotation.*
import kotlinx.coroutines.*
import java.lang.reflect.*
import kotlin.coroutines.*

@Keep
internal class AndroidExceptionPreHandler :
AbstractCoroutineContextElement(CoroutineExceptionHandler), CoroutineExceptionHandler
{
Expand Down