Merge "Add comments and additional constants for the known bad anomaly types." into...

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

diff --git a/Android.mk b/Android.mk
index eeaad0c..e37e9fb 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
@@ -20,23 +21,29 @@ 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-compat \
     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 \
-    core-oj \
     telephony-common \
     ims-common
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-arch-lifecycle-runtime \
+    android-arch-lifecycle-extensions \
+    guava \
     jsr305 \
-    settings-logtags
+    settings-logtags \
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags