commit b277557991f26190f4594936830b9eb9cf82278a
author Matthew Fritze <mfritze@google.com> Tue Dec 05 10:46:47 2017 -0800
committer Matthew Fritze <mfritze@google.com> Wed Dec 06 08:19:07 2017 -0800
tree 13a033198e69447a61a85da3dac757f4ad5efda7
parent 4d9e1b4b6b276719ab26685994d3328524ae68bd

Depend settings on slices in the support library

Test: make
Bug: 67996923
Change-Id: Ifcb544424df27f3faa8872e6266de286cc706d59

Android.mk

diff --git a/Android.mk b/Android.mk
index c59d938..b9121ec 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,13 +20,16 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
+    android-slices-builders \
+    android-slices-core \
+    android-slices-view \
     android-support-v4 \
     android-support-v13 \
     android-support-v7-appcompat \
     android-support-v7-cardview \
     android-support-v7-preference \
     android-support-v7-recyclerview \
-    android-support-v14-preference
+    android-support-v14-preference \
 
 LOCAL_JAVA_LIBRARIES := \
     bouncycastle \
@@ -34,8 +37,10 @@
     ims-common
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
+    apptoolkit-arch-core-runtime \
+    apptoolkit-lifecycle-extensions \
     jsr305 \
-    settings-logtags
+    settings-logtags \
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 

proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 7a403a4..0a299ed 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -27,6 +27,9 @@
 -keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int, int);
+}
 
 # Keep annotated classes or class members.
 -keep @android.support.annotation.Keep class *