Merge "Export change id processor."

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",
+   name: "framework-platform-compat-config",
-    src: ":framework-annotation-proc",
+   src: ":framework-minus-apex",
 }
 
 // A temporary build target that is conditionally included on the bootclasspath if

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",
+   name: "services-platform-compat-config",
-    src: ":services",
+   src: ":services",
 }
 
 filegroup {

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 {