Merge changes from topics "ww_4_delete_data", "ww_3_checkconfig", "ww_2_uploadIntent...

[android-x86/packages-apps-Settings.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index c59d938..df85bbc 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -20,13 +20,16 @@ LOCAL_USE_AAPT2 := true
 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 @@ LOCAL_JAVA_LIBRARIES := \
     ims-common
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-arch-lifecycle-runtime \
+    android-arch-lifecycle-extensions \
     jsr305 \
-    settings-logtags
+    settings-logtags \
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags