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
diff --git a/Android.bp b/Android.bp
index d298af2..bc6ed51 100644
--- a/Android.bp
+++ b/Android.bp
@@ -524,23 +524,9 @@
],
}
-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 8ebad4e..0b1e3488 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -75,10 +75,6 @@
"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 @@
}
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 b7fd227..7a3a910 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -56,10 +56,6 @@
"dnsresolver_aidl_interface-V2-java",
"netd_event_listener_interface-java",
],
-
- plugins: [
- "compat-changeid-annotation-processor",
- ],
}
java_genrule {