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
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index a4db776..975ca08 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -21,6 +21,7 @@
name: "framework-tethering",
defaults: [
"framework-tethering-defaults",
+ "FlaggedApiDefaults",
],
impl_library_visibility: [
"//packages/modules/Connectivity/Tethering:__subpackages__",
diff --git a/framework-t/Android.bp b/framework-t/Android.bp
index 5ae1ef9..7c6c6aa 100644
--- a/framework-t/Android.bp
+++ b/framework-t/Android.bp
@@ -121,6 +121,7 @@
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.
diff --git a/framework/Android.bp b/framework/Android.bp
index e577e6d..794e1db 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -19,6 +19,15 @@
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 @@
defaults: [
"framework-connectivity-defaults",
"CronetJavaDefaults",
+ "FlaggedApiDefaults",
],
installable: true,
jarjar_rules: ":framework-connectivity-jarjar-rules",