diff --git a/.changeset/two-sloths-tan.md b/.changeset/two-sloths-tan.md new file mode 100644 index 00000000..c32cd0fc --- /dev/null +++ b/.changeset/two-sloths-tan.md @@ -0,0 +1,5 @@ +--- +"client-sdk-android": patch +--- + +Proguard rule optimizations diff --git a/livekit-android-sdk/consumer-rules.pro b/livekit-android-sdk/consumer-rules.pro index 9c53650b..a3d65428 100644 --- a/livekit-android-sdk/consumer-rules.pro +++ b/livekit-android-sdk/consumer-rules.pro @@ -13,28 +13,27 @@ } -keep,includedescriptorclasses class io.livekit.android.**$$serializer { *; } --keepclassmembers class io.livekit.android.** { - *** Companion; -} + -keepclasseswithmembers class io.livekit.android.** { kotlinx.serialization.KSerializer serializer(...); } # WebRTC ######################################### --keep class livekit.org.webrtc.** { *; } - -# JNI Zero initialization (required for WebRTC native method registration) --keep class livekit.org.jni_zero.JniInit { - # Keep the init method un-obfuscated for native code callback - private static java.lang.Object[] init(); +# Ensure java methods called from Native are preserved. +-keepclasseswithmembers,includedescriptorclasses class * { + @livekit.**.CalledByNative ; +} +-keepclasseswithmembers,includedescriptorclasses class * { + @livekit.**.CalledByNativeUnchecked ; } # NIST sdp parser ######################################### --keep class android.gov.nist.** { *; } --dontwarn com.sun.nio.sctp.** --dontwarn org.apache.log4j.** +# Preserve reflection used for Parser registrations +-keep class android.gov.nist.javax.sdp.parser.*Parser { *; } +-keep class android.gov.nist.javax.sdp.parser.ParserFactory { *; } +-keep class android.gov.nist.javax.sdp.parser.SDPParser { *; } # Protobuf ######################################### diff --git a/sample-app-compose/build.gradle b/sample-app-compose/build.gradle index ecc4cd49..05cfe109 100644 --- a/sample-app-compose/build.gradle +++ b/sample-app-compose/build.gradle @@ -23,8 +23,10 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + // For testing purposes only. Use your own signing keys when making a production app. + signingConfig signingConfigs.debug } } compileOptions {