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 (cherry picked from commit db23306e834e829e9ff95083cb514215c36aeaec)
This commit is contained in:
parent
363a726621
commit
1503d31a7d
29
Android.bp
29
Android.bp
@ -551,36 +551,9 @@ java_library {
|
||||
],
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "framework-annotation-proc",
|
||||
visibility: ["//visibility:private"],
|
||||
srcs: [
|
||||
":framework-all-sources",
|
||||
"core/java/**/*.logtags",
|
||||
],
|
||||
sdk_version: "core_platform",
|
||||
libs: [
|
||||
"app-compat-annotations",
|
||||
"ext",
|
||||
"unsupportedappusage",
|
||||
// Additional dependencies needed to build the ike API classes.
|
||||
"ike-internals",
|
||||
],
|
||||
|
||||
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
|
||||
|
@ -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"],
|
||||
|
||||
|
@ -130,10 +130,6 @@ java_library_static {
|
||||
"netd_event_listener_interface-java",
|
||||
"overlayable_policy_aidl-java",
|
||||
],
|
||||
|
||||
plugins: [
|
||||
"compat-changeid-annotation-processor",
|
||||
],
|
||||
}
|
||||
|
||||
java_genrule {
|
||||
|
@ -13,8 +13,4 @@ java_library_static {
|
||||
"services.core",
|
||||
"app-compat-annotations",
|
||||
],
|
||||
|
||||
plugins: [
|
||||
"compat-changeid-annotation-processor",
|
||||
],
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user