diff --git a/packages/SettingsProvider/Android.bp b/packages/SettingsProvider/Android.bp
index 346462d..92ebe09 100644
--- a/packages/SettingsProvider/Android.bp
+++ b/packages/SettingsProvider/Android.bp
@@ -31,6 +31,7 @@
         "unsupportedappusage",
     ],
     static_libs: [
+        "device_config_service_flags_java",
         "junit",
         "SettingsLibDeviceStateRotationLock",
         "SettingsLibDisplayUtils",
@@ -56,7 +57,10 @@
     ],
     static_libs: [
         "androidx.test.rules",
+        "device_config_service_flags_java",
+        "flag-junit",
         "mockito-target-minus-junit4",
+        "platform-test-annotations",
         "SettingsLibDeviceStateRotationLock",
         "SettingsLibDisplayUtils",
         "platform-test-annotations",
@@ -79,3 +83,16 @@
     manifest: "test/AndroidManifest.xml",
     test_config: "test/AndroidTest.xml",
 }
+
+aconfig_declarations {
+    name: "device_config_service_flags",
+    package: "com.android.providers.settings",
+    srcs: [
+        "src/com/android/providers/settings/device_config_service.aconfig",
+    ],
+}
+
+java_aconfig_library {
+    name: "device_config_service_flags_java",
+    aconfig_declarations: "device_config_service_flags",
+}