commit 49fadd625c17cf4ac8dffd662c6682f9fc01eb24
author Paul Duffin <paulduffin@google.com> Wed Nov 29 17:45:39 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 29 17:45:39 2023 +0000
tree caca3bd55bf3032d8b3cfeeb75db32a561429bd6
parent d2f934a727d074cfa5c9cae24cd28d7e4cb3b5f6
parent da8fac1edbbbeea734458ccff2ea17ea0d34a3bc

Merge "Remove workaround to remove FlaggedAPI in ump" into udc-mainline-prod

framework/Android.bp

diff --git a/framework/Android.bp b/framework/Android.bp
index 79e77ef..10acbd0 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -22,10 +22,6 @@
 // In the branch which does not support FlaggedAPI, use this default to ignore the annotated APIs.
 java_defaults {
     name: "FlaggedApiDefaults",
-    api_dir: "udc-extended-api",
-    droiddoc_options: [
-      "--hide-annotation android.annotation.FlaggedApi",
-    ],
 }
 
 // The above variables may have different values