Merge "Export change id processor." into rvc-dev

4 files changed, 1 insertions, 37 deletions

diff --git a/Android.bp b/Android.bp
index be1aefca39bc..30d44091b6a6 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 temporary build target that is conditionally included on the bootclasspath if
diff --git a/services/Android.bp b/services/Android.bp
index 1ce7dcfff03b..730b9a5dc3e3 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 7a26b21d6ac7..dcf761525382 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 cdbe77a3d64c..2f6592bd33b0 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",
-    ],
 }