diff --git a/Android.bp b/Android.bp
index 7903742a0fbe4..791edaf32b3ab 100644
--- a/Android.bp
+++ b/Android.bp
@@ -463,13 +463,6 @@ java_library {
     defaults: ["framework-defaults"],
     srcs: [":framework-all-sources"],
     installable: false,
-}
-
-java_library {
-    name: "framework-annotation-proc",
-    defaults: ["framework-aidl-export-defaults"],
-    srcs: [":framework-all-sources"],
-    installable: false,
     plugins: [
         "unsupportedappusage-annotation-processor",
         "compat-changeid-annotation-processor",
@@ -478,7 +471,7 @@ java_library {
 
 platform_compat_config {
     name: "framework-platform-compat-config",
-    src: ":framework-annotation-proc",
+    src: ":framework-all",
 }
 
 // A library including just UnsupportedAppUsage.java classes.
@@ -1577,7 +1570,7 @@ aidl_mapping {
 
 genrule {
     name: "framework-annotation-proc-index",
-    srcs: [":framework-annotation-proc"],
+    srcs: [":framework-all"],
     cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)",
     out: ["unsupportedappusage_index.csv"],
     dist: {