Merge changes from topic "picker-analytics" into pi-dev

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

diff --git a/Android.mk b/Android.mk
index b9121ec..61851cf 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -12,6 +12,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_PACKAGE_NAME := Settings
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_TAGS := optional
@@ -37,8 +38,9 @@ LOCAL_JAVA_LIBRARIES := \
     ims-common
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    apptoolkit-arch-core-runtime \
-    apptoolkit-lifecycle-extensions \
+    android-arch-lifecycle-runtime \
+    android-arch-lifecycle-extensions \
+    guava \
     jsr305 \
     settings-logtags \