-LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_PACKAGE_NAME := Settings
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_TAGS := optional
+LOCAL_USE_AAPT2 := true
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \