diff --git a/Android.bp b/Android.bp
index 7e68986ebeec6..0a3ca3b808ea4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -369,6 +369,7 @@ filegroup {
         ":framework_native_aidl",
         ":gatekeeper_aidl",
         ":gsiservice_aidl",
+        ":idmap2_aidl",
         ":idmap2_core_aidl",
         ":incidentcompanion_aidl",
         ":inputconstants_aidl",
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 25890b056c33e..afa08405d6429 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -81,8 +81,6 @@ java_library_static {
         ":dumpstate_aidl",
         ":framework_native_aidl",
         ":gsiservice_aidl",
-        ":idmap2_aidl",
-        ":idmap2_core_aidl",
         ":inputconstants_aidl",
         ":installd_aidl",
         ":storaged_aidl",