diff --git a/patches/glean-noop.patch b/patches/glean-noop.patch
index f17b319..a608b34 100644
--- a/patches/glean-noop.patch
+++ b/patches/glean-noop.patch
@@ -23,6 +23,31 @@ index 0ca6fc7..e365179 100644
  # they use won't be there, hence the warning. It's safe to suppress these.
 --dontwarn mozilla.telemetry.glean.testing.**
 +#-dontwarn mozilla.telemetry.glean.testing.**
+diff --git a/glean-core/android/proguard-rules-consumer.pro b/glean-core/android/proguard-rules-consumer.pro
+index 0ca6fc7..e365179 100644
+--- a/glean-core/android/proguard-rules-consumer.pro
++++ b/glean-core/android/proguard-rules-consumer.pro
+@@ -2,15 +2,15 @@
+ 
+ # JNA specific rules
+ # See https://github.com/java-native-access/jna/blob/master/www/FrequentlyAskedQuestions.md#jna-on-android
+--dontwarn java.awt.*
+--keep class com.sun.jna.* { *; }
+--keepclassmembers class * extends com.sun.jna.* { public *; }
++#-dontwarn java.awt.*
++#-keep class com.sun.jna.* { *; }
++#-keepclassmembers class * extends com.sun.jna.* { public *; }
+ 
+ # Glean specific rules
+--keep class mozilla.telemetry.** { *; }
++#-keep class mozilla.telemetry.** { *; }
+ 
+ # The Glean SDK ships with classes used for tests as well. They are disabled
+ # and not directly usable in production code: they throw if used there. They
+ # can be used in tests just fine but, outside of tests, the test dependency
+ # they use won't be there, hence the warning. It's safe to suppress these.
+--dontwarn mozilla.telemetry.glean.testing.**
++#-dontwarn mozilla.telemetry.glean.testing.**
 diff --git a/glean-core/android-native/proguard-rules-consumer.pro b/glean-core/android-native/proguard-rules-consumer.pro
 index 53519d424..855cad12e 100644
 --- a/glean-core/android-native/proguard-rules-consumer.pro