commit 7313413afcb6c03039ea95697efb92db822336f6
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 10 19:01:50 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 10 19:01:50 2024 +0000
tree 7eaa6b43b7cb9bbb242759a62d2e096a77c52860
parent 23e337b260dc5331d5ee2af9f0069534436092ca
parent b1477bbf3f82e54ee1bbbfa8c93fa3727133c42c

Snap for 11296156 from b1477bbf3f82e54ee1bbbfa8c93fa3727133c42c to mainline-tzdata5-release

Change-Id: Ib1298eb03372aa070ef6657d20686919e8a9c24d

Android.bp

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 {

javatests/com/android/os/classpath/Android.bp

diff --git a/javatests/com/android/os/classpath/Android.bp b/javatests/com/android/os/classpath/Android.bp
index 1e86427..542a6f2 100644
--- a/javatests/com/android/os/classpath/Android.bp
+++ b/javatests/com/android/os/classpath/Android.bp
@@ -34,5 +34,6 @@
         "cts",
         "general-tests",
         "mts-sdkextensions",
+        "mcts-sdkextensions",
     ],
 }

javatests/com/android/os/ext/Android.bp

diff --git a/javatests/com/android/os/ext/Android.bp b/javatests/com/android/os/ext/Android.bp
index f9af6d2..c772a98 100644
--- a/javatests/com/android/os/ext/Android.bp
+++ b/javatests/com/android/os/ext/Android.bp
@@ -32,6 +32,7 @@
     test_suites: [
         "cts",
         "mts-sdkextensions",
+        "mcts-sdkextensions",
         "general-tests",
     ],
     jni_libs: [