From fc948d8675ef20d8e59ff1fa9b3ccddb9ee00aa2 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 17 Dec 2020 16:57:35 +0000
Subject: Unbundle ART API from android-non-updatable

Stop tracking the ART APIs in the non-updatable current.txt, and
instead add in the txt/srcjar/jar files produced by the art module's
java_sdk_library.

Bug: 173606718
Test: manual last_released check of merged api txt (b/174847574 to
      automate)
Change-Id: I446a381f2b364a114ce391b99a13742d6769f14d
---
 StubLibraries.bp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'StubLibraries.bp')

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 4b28352c85ff..ed8781e2ff86 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -47,7 +47,6 @@ stubs_defaults {
         "core/java/**/*.logtags",
         ":opt-telephony-srcs",
         ":opt-net-voip-srcs",
-        ":art.module.public.api{.public.stubs.source}",
         "**/package.html",
     ],
     sdk_version: "none",
@@ -240,6 +239,7 @@ java_library_static {
     name: "android_stubs_current",
     srcs: [ ":api-stubs-docs-non-updatable" ],
     static_libs: [
+        "art.module.public.api.stubs",
         "conscrypt.module.public.api.stubs",
         "framework-media.stubs",
         "framework-mediaprovider.stubs",
@@ -258,6 +258,7 @@ java_library_static {
     name: "android_system_stubs_current",
     srcs: [ ":system-api-stubs-docs-non-updatable" ],
     static_libs: [
+        "art.module.public.api.stubs",
         "conscrypt.module.public.api.stubs",
         "framework-media.stubs.system",
         "framework-mediaprovider.stubs.system",
@@ -292,6 +293,7 @@ java_library_static {
     static_libs: [
         // Modules do not have test APIs, but we want to include their SystemApis, like we include
         // the SystemApi of framework-non-updatable-sources.
+        "art.module.public.api.stubs",
         "conscrypt.module.public.api.stubs",
         "framework-media.stubs.system",
         "framework-mediaprovider.stubs.system",
@@ -328,6 +330,7 @@ java_library_static {
         "android_stubs_dists_default",
     ],
     libs: ["sdk_system_29_android"],
+    static_libs: ["art.module.public.api.stubs"],
     dist: {
         dir: "apistubs/android/module-lib",
     },
-- 
cgit v1.2.3