From db23306e834e829e9ff95083cb514215c36aeaec Mon Sep 17 00:00:00 2001
From: Artur Satayev <satayev@google.com>
Date: Wed, 25 Mar 2020 15:36:55 +0000
Subject: 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
---
 Android.bp               | 18 ++----------------
 services/Android.bp      |  8 ++------
 services/core/Android.bp |  4 ----
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/Android.bp b/Android.bp
index d298af2ce0b9..bc6ed5114160 100644
--- a/Android.bp
+++ b/Android.bp
@@ -524,23 +524,9 @@ java_library {
     ],
 }
 
-java_library {
-    name: "framework-annotation-proc",
-    defaults: ["framework-defaults"],
-    srcs: [":framework-all-sources"],
-    libs: [
-        "app-compat-annotations",
-        "unsupportedappusage",
-    ],
-    installable: false,
-    plugins: [
-        "compat-changeid-annotation-processor",
-    ],
-}
-
 platform_compat_config {
-    name: "framework-platform-compat-config",
-    src: ":framework-annotation-proc",
+   name: "framework-platform-compat-config",
+   src: ":framework-minus-apex",
 }
 
 // A library including just UnsupportedAppUsage.java classes.
diff --git a/services/Android.bp b/services/Android.bp
index 8ebad4efc1b5..0b1e34881e47 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -75,10 +75,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"],
 
@@ -94,8 +90,8 @@ cc_library_shared {
 }
 
 platform_compat_config {
-    name: "services-platform-compat-config",
-    src: ":services",
+   name: "services-platform-compat-config",
+   src: ":services",
 }
 
 filegroup {
diff --git a/services/core/Android.bp b/services/core/Android.bp
index b7fd227ed0bb..7a3a910c0447 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -56,10 +56,6 @@ java_library_static {
         "dnsresolver_aidl_interface-V2-java",
         "netd_event_listener_interface-java",
     ],
-
-    plugins: [
-        "compat-changeid-annotation-processor",
-    ],
 }
 
 java_genrule {
-- 
cgit v1.2.3-59-g8ed1b