Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I89496090c2b95c9657851724c161cc2fe16f3e20
Change-Id: Id4d822f6bf4c466a8a0f53e6372573106d45c4e3
diff --git a/Android.bp b/Android.bp
index 9f3391b..e73db99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -116,6 +116,8 @@
],
}
+// TODO: b/316383039 - Remove this module and the script when udc-mainline-prod
+// branch is removed.
// The options passed to Metalava when generating API signature files and stubs
// for SDK extension releases.
genrule {
diff --git a/java/android/os/ext/Android.bp b/java/android/os/ext/Android.bp
index 76bcc2f..831bad5 100644
--- a/java/android/os/ext/Android.bp
+++ b/java/android/os/ext/Android.bp
@@ -47,12 +47,3 @@
"test_com.android.sdkext",
],
}
-
-java_api_contribution {
- name: "framework-sdkextensions-public-stubs",
- api_surface: "public",
- api_file: "api/current.txt",
- visibility: [
- "//build/orchestrator/apis",
- ],
-}