Add java_defaults for @FlaggedApi handling
This CL is a preparation to ignore @FlaggedApi API in udc mainline branch Bug: 299411828 Test: TH Change-Id: If3217916b2c37ebaa7b48d8387c69cb078af9550
This commit is contained in:
parent
5dcd14569e
commit
310f11acfe
3 changed files with 12 additions and 0 deletions
|
|
@ -21,6 +21,7 @@ java_sdk_library {
|
|||
name: "framework-tethering",
|
||||
defaults: [
|
||||
"framework-tethering-defaults",
|
||||
"FlaggedApiDefaults",
|
||||
],
|
||||
impl_library_visibility: [
|
||||
"//packages/modules/Connectivity/Tethering:__subpackages__",
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ java_sdk_library {
|
|||
defaults: [
|
||||
"framework-connectivity-t-defaults",
|
||||
"enable-framework-connectivity-t-targets",
|
||||
"FlaggedApiDefaults",
|
||||
],
|
||||
api_srcs: framework_remoteauth_api_srcs,
|
||||
// Do not add static_libs to this library: put them in framework-connectivity instead.
|
||||
|
|
|
|||
|
|
@ -19,6 +19,15 @@ package {
|
|||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
// In the branch which does not support FlaggedAPI, use this default to ignore the annotated APIs.
|
||||
java_defaults {
|
||||
name: "FlaggedApiDefaults",
|
||||
}
|
||||
|
||||
// The above variables may have different values
|
||||
// depending on the branch, and this comment helps
|
||||
// separate them from the rest of the file to avoid merge conflicts
|
||||
|
||||
filegroup {
|
||||
name: "framework-connectivity-internal-sources",
|
||||
srcs: [
|
||||
|
|
@ -152,6 +161,7 @@ java_sdk_library {
|
|||
defaults: [
|
||||
"framework-connectivity-defaults",
|
||||
"CronetJavaDefaults",
|
||||
"FlaggedApiDefaults",
|
||||
],
|
||||
installable: true,
|
||||
jarjar_rules: ":framework-connectivity-jarjar-rules",
|
||||
|
|
|
|||
Loading…
Reference in a new issue