diff options
| -rw-r--r-- | Android.bp | 18 | ||||
| -rw-r--r-- | services/Android.bp | 8 | ||||
| -rw-r--r-- | services/core/Android.bp | 4 |
3 files changed, 4 insertions, 26 deletions
diff --git a/Android.bp b/Android.bp index fec632df73d1..c9ae9bad7deb 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 temporary build target that is conditionally included on the bootclasspath if diff --git a/services/Android.bp b/services/Android.bp index 1ab23955610b..90f98e2bd7a6 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 { |