commit 5c89e70a1fbbc9f9251342358835c8a139eb2285
author Paul Duffin <paulduffin@google.com> Thu Mar 26 15:33:48 2020 +0000
committer Paul Duffin <paulduffin@google.com> Thu Mar 26 15:41:25 2020 +0000
tree a53e1605bc50bf3fbbbf2d18de245f5c3d85c138
parent a281e926fc82240eaca8d9076f6d9bb4198383b9

Reference libcore, conscrypt and icu sources directly

Avoids an extra aggregation step in the creation of the API sources.

Test: m nothing
Bug: 142935992
Change-Id: Ia15c3ceb9fc59e7945687536c60ce265ec95781e

ApiDocs.bp

diff --git a/ApiDocs.bp b/ApiDocs.bp
index b7e3646..7fd1168 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -65,8 +65,9 @@
         "test-base/src/**/*.java",
         ":opt-telephony-srcs",
         ":opt-net-voip-srcs",
-        ":core-current-stubs-source",
-        ":core_public_api_files",
+        ":art-module-public-api-stubs-source",
+        ":conscrypt-module-public-api-stubs-source",
+        ":android_icu4j_public_api_files",
         "test-mock/src/**/*.java",
         "test-runner/src/**/*.java",
     ],

StubLibraries.bp

diff --git a/StubLibraries.bp b/StubLibraries.bp
index fccb258..f081071 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -47,8 +47,9 @@
         "core/java/**/*.logtags",
         ":opt-telephony-srcs",
         ":opt-net-voip-srcs",
-        ":core-current-stubs-source",
-        ":core_public_api_files",
+        ":art-module-public-api-stubs-source",
+        ":conscrypt-module-public-api-stubs-source",
+        ":android_icu4j_public_api_files",
     ],
     libs: ["framework-internal-utils"],
     installable: false,