diff --git a/Android.bp b/Android.bp
index cc754f21902a..b3b0a9a3fb22 100644
--- a/Android.bp
+++ b/Android.bp
@@ -177,6 +177,7 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
+                "framework-auxiliary.impl",
                 "framework-supplementalapi.impl",
             ],
         },
diff --git a/ApiDocs.bp b/ApiDocs.bp
index 4aecc8fe4504..6f92f01d6723 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -116,6 +116,7 @@ stubs_defaults {
         ":i18n.module.public.api{.public.stubs.source}",
 
         ":framework-appsearch-sources",
+        ":framework-auxiliary-sources",
         ":framework-connectivity-sources",
         ":framework-connectivity-tiramisu-updatable-sources",
         ":framework-graphics-srcs",
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 77b26f80ab97..fcb319a81cf6 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -285,6 +285,7 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -302,6 +303,7 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -334,6 +336,7 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -362,6 +365,7 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -378,6 +382,7 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -410,6 +415,7 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
diff --git a/api/Android.bp b/api/Android.bp
index a22c2f6af35a..9428fcc41b81 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -128,6 +128,7 @@ combined_apis {
         "i18n.module.public.api",
     ],
     conditional_bootclasspath: [
+        "framework-auxiliary",
         "framework-supplementalapi",
     ],
     system_server_classpath: [
diff --git a/boot/Android.bp b/boot/Android.bp
index 3273f2c6ed8e..8958d70f63cf 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -55,6 +55,10 @@ platform_bootclasspath {
             apex: "com.android.art",
             module: "art-bootclasspath-fragment",
         },
+        {
+            apex: "com.android.auxiliary",
+            module: "com.android.auxiliary-bootclasspath-fragment",
+        },
         {
             apex: "com.android.conscrypt",
             module: "com.android.conscrypt-bootclasspath-fragment",