Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"

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

diff --git a/Android.mk b/Android.mk
index 938112a..aab265b 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,9 @@ include $(CLEAR_VARS)
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
+LOCAL_PRODUCT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.settings
 LOCAL_MODULE_TAGS := optional
 LOCAL_USE_AAPT2 := true
 
@@ -36,7 +38,6 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
     androidx.legacy_legacy-preference-v14 \
 
 LOCAL_JAVA_LIBRARIES := \
-    bouncycastle \
     telephony-common \
     ims-common