From f9172bd785203c989363ae0e3837bfa3f912e5ef Mon Sep 17 00:00:00 2001
From: Artur Satayev <satayev@google.com>
Date: Wed, 25 Mar 2020 15:36:55 +0000
Subject: [PATCH] Export change id processor.

- Don't declare the plugin directly, it is exported via java_library that defines the sources.
- Remove unneeded framework-annotation-proc.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Ie750b5391229d21679a8610780b9f8d4a997e204
Merged-In: Ie750b5391229d21679a8610780b9f8d4a997e204
(cherry picked from commit 9f5a5623a7ff91d4e77b9f5634e63ca3b214758a)
---
 Android.bp                       | 26 +-------------------------
 services/Android.bp              |  4 ----
 services/core/Android.bp         |  4 ----
 services/devicepolicy/Android.bp |  4 ----
 4 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/Android.bp b/Android.bp
index b0e0b35a1f767..4d559e8ef03db 100644
--- a/Android.bp
+++ b/Android.bp
@@ -548,33 +548,9 @@ java_library {
     ],
 }
 
-java_library {
-    name: "framework-annotation-proc",
-    srcs: [
-        ":framework-all-sources",
-        "core/java/**/*.logtags",
-    ],
-    sdk_version: "core_platform",
-    libs: [
-        "app-compat-annotations",
-        "ext",
-        "unsupportedappusage",
-    ],
-
-    installable: false,
-    plugins: [
-        "compat-changeid-annotation-processor",
-    ],
-    static_libs: [
-        "framework-internal-utils",
-        "exoplayer2-extractor",
-        "android.hardware.wifi-V1.0-java-constants",
-    ]
-}
-
 platform_compat_config {
     name: "framework-platform-compat-config",
-    src: ":framework-annotation-proc",
+    src: ":framework-minus-apex",
 }
 
 // A library including just UnsupportedAppUsage.java classes.
diff --git a/services/Android.bp b/services/Android.bp
index 52c5993a28626..9785493f4d680 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -81,10 +81,6 @@ java_library {
         "framework-tethering-stubs-module_libs_api",
     ],
 
-    plugins: [
-        "compat-changeid-annotation-processor",
-    ],
-
     // Uncomment to enable output of certain warnings (deprecated, unchecked)
     //javacflags: ["-Xlint"],
 
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 7a26b21d6ac70..dcf7615253826 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -130,10 +130,6 @@ java_library_static {
         "netd_event_listener_interface-java",
         "overlayable_policy_aidl-java",
     ],
-
-    plugins: [
-        "compat-changeid-annotation-processor",
-    ],
 }
 
 java_genrule {
diff --git a/services/devicepolicy/Android.bp b/services/devicepolicy/Android.bp
index cdbe77a3d64cc..2f6592bd33b06 100644
--- a/services/devicepolicy/Android.bp
+++ b/services/devicepolicy/Android.bp
@@ -13,8 +13,4 @@ java_library_static {
         "services.core",
         "app-compat-annotations",
     ],
-
-    plugins: [
-        "compat-changeid-annotation-processor",
-    ],
 }