Merge "Update dark theme to have new screen"

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

diff --git a/Android.mk b/Android.mk
index 938112a..e385b34 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -14,38 +14,42 @@ 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
 
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
+    androidx-constraintlayout_constraintlayout \
     androidx.slice_slice-builders \
     androidx.slice_slice-core \
     androidx.slice_slice-view \
     androidx.core_core \
-    androidx.legacy_legacy-support-v4 \
-    androidx.legacy_legacy-support-v13 \
     androidx.appcompat_appcompat \
     androidx.cardview_cardview \
     androidx.preference_preference \
     androidx.recyclerview_recyclerview \
-    androidx.legacy_legacy-preference-v14 \
+    com.google.android.material_material \
+    setupcompat \
+    setupdesign
 
 LOCAL_JAVA_LIBRARIES := \
-    bouncycastle \
     telephony-common \
     ims-common
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
+    androidx-constraintlayout_constraintlayout-solver \
     androidx.lifecycle_lifecycle-runtime \
     androidx.lifecycle_lifecycle-extensions \
     guava \
     jsr305 \
+    settings-contextual-card-protos-lite \
+    contextualcards \
     settings-logtags \
+    zxing-core-1.7
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
@@ -55,11 +59,18 @@ ifneq ($(INCREMENTAL_BUILDS),)
     LOCAL_JACK_FLAGS := --multi-dex native
 endif
 
-include frameworks/opt/setupwizard/library/common-gingerbread.mk
 include frameworks/base/packages/SettingsLib/common.mk
+include frameworks/base/packages/SettingsLib/search/common.mk
 
 include $(BUILD_PACKAGE)
 
+# ====  prebuilt library  ========================
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+    contextualcards:libs/contextualcards.aar
+include $(BUILD_MULTI_PREBUILT)
+
 # Use the following include to make our test apk.
 ifeq (,$(ONE_SHOT_MAKEFILE))
 include $(call all-makefiles-under,$(LOCAL_PATH))