1 files changed, 17 insertions, 2 deletions
diff --git a/packages/Shell/Android.bp b/packages/Shell/Android.bp
index 253145468e47..5fdf0451d2c8 100644
--- a/packages/Shell/Android.bp
+++ b/packages/Shell/Android.bp
@@ -8,8 +8,14 @@ package {
 }
 
 // used both for the android_app and android_library
-shell_srcs = ["src/**/*.java",":dumpstate_aidl"]
-shell_static_libs = ["androidx.legacy_legacy-support-v4"]
+shell_srcs = [
+    "src/**/*.java",
+    ":dumpstate_aidl",
+]
+shell_static_libs = [
+    "androidx.legacy_legacy-support-v4",
+    "wear_aconfig_declarations_flags_java_lib",
+]
 
 android_app {
     name: "Shell",
@@ -22,6 +28,11 @@ android_app {
     libs: [
         "device_policy_aconfig_flags_lib",
     ],
+    flags_packages: [
+        "android.security.flags-aconfig",
+        "android.permission.flags-aconfig",
+        "wear_aconfig_declarations",
+    ],
     platform_apis: true,
     certificate: "platform",
     privileged: true,
@@ -43,4 +54,8 @@ android_library {
     static_libs: shell_static_libs,
     platform_apis: true,
     manifest: "AndroidManifest.xml",
+    flags_packages: [
+        "android.security.flags-aconfig",
+        "android.permission.flags-aconfig",
+    ],
 }