Skip to content
Snippets Groups Projects
Commit 310f11ac authored by Motomu Utsumi's avatar Motomu Utsumi
Browse files

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
parent 5dcd1456
No related branches found
No related tags found
No related merge requests found
...@@ -21,6 +21,7 @@ java_sdk_library { ...@@ -21,6 +21,7 @@ java_sdk_library {
name: "framework-tethering", name: "framework-tethering",
defaults: [ defaults: [
"framework-tethering-defaults", "framework-tethering-defaults",
"FlaggedApiDefaults",
], ],
impl_library_visibility: [ impl_library_visibility: [
"//packages/modules/Connectivity/Tethering:__subpackages__", "//packages/modules/Connectivity/Tethering:__subpackages__",
......
...@@ -121,6 +121,7 @@ java_sdk_library { ...@@ -121,6 +121,7 @@ java_sdk_library {
defaults: [ defaults: [
"framework-connectivity-t-defaults", "framework-connectivity-t-defaults",
"enable-framework-connectivity-t-targets", "enable-framework-connectivity-t-targets",
"FlaggedApiDefaults",
], ],
api_srcs: framework_remoteauth_api_srcs, api_srcs: framework_remoteauth_api_srcs,
// Do not add static_libs to this library: put them in framework-connectivity instead. // Do not add static_libs to this library: put them in framework-connectivity instead.
......
...@@ -19,6 +19,15 @@ package { ...@@ -19,6 +19,15 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"], 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 { filegroup {
name: "framework-connectivity-internal-sources", name: "framework-connectivity-internal-sources",
srcs: [ srcs: [
...@@ -152,6 +161,7 @@ java_sdk_library { ...@@ -152,6 +161,7 @@ java_sdk_library {
defaults: [ defaults: [
"framework-connectivity-defaults", "framework-connectivity-defaults",
"CronetJavaDefaults", "CronetJavaDefaults",
"FlaggedApiDefaults",
], ],
installable: true, installable: true,
jarjar_rules: ":framework-connectivity-jarjar-rules", jarjar_rules: ":framework-connectivity-jarjar-rules",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment