summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYigit Boyar <yboyar@google.com>2020-04-24 09:20:43 -0700
committerYigit Boyar <yboyar@google.com>2020-04-30 16:09:43 +0000
commit63d0ca4df6407dbbce9abc922a94e007acd4a6ed (patch)
tree8ad0cc8502f3fb4fa767bcb3303b87dfa127a4c9
parentb9931b053ca836ee68b365a548fc11a2000674ec (diff)
downloaddata-binding-63d0ca4df6407dbbce9abc922a94e007acd4a6ed.tar.gz
Fix proguard rules for AndroidX
When we've created androidx version of data binding, I forgot to update the proguard rules which breaks dynamic apps. Bug: 137821399 Test: n/a Change-Id: I608a094a5e08c1fdf3195aabc23b701f826dabc3
-rw-r--r--extensions/library/proguard-consumer-rules.pro2
-rw-r--r--extensions/library/proguard-rules.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/library/proguard-consumer-rules.pro b/extensions/library/proguard-consumer-rules.pro
index cbed6df8..c20c824a 100644
--- a/extensions/library/proguard-consumer-rules.pro
+++ b/extensions/library/proguard-consumer-rules.pro
@@ -1,2 +1,2 @@
# instant apps load these via reflection so we need to keep them.
--keep public class * extends android.databinding.DataBinderMapper
+-keep public class * extends androidx.databinding.DataBinderMapper
diff --git a/extensions/library/proguard-rules.txt b/extensions/library/proguard-rules.txt
index d4dc5c0e..7775c8d6 100644
--- a/extensions/library/proguard-rules.txt
+++ b/extensions/library/proguard-rules.txt
@@ -1,2 +1,2 @@
--dontwarn android.databinding.ViewDataBinding
--dontwarn android.databinding.ViewDataBinding$LiveDataListener
+-dontwarn androidx.databinding.ViewDataBinding
+-dontwarn androidx.databinding.ViewDataBinding$LiveDataListener