commit bf48c955ab22cee2a682934f97bdbbd82186cecc
author Paul Duffin <paulduffin@google.com> Thu May 14 17:55:46 2020 +0100
committer Paul Duffin <paulduffin@google.com> Tue May 26 20:28:42 2020 +0100
tree dfa30d04517fec10b49fc86cba52d2f49f1339a0
parent 12416fba4a9f98d697a6dfb27a7da6bc58dc570d

Use tags to access conscrypt sources

Avoids direct access to the stub sources and instead access them via
tags passed to the java_sdk_library.

Bug: 155164730
Test: m checkapi
Merged-In: I93dfb8bfac60bd7ab628292667c8d7a9d5e8eb82
Change-Id: I93dfb8bfac60bd7ab628292667c8d7a9d5e8eb82
(cherry picked from commit e55d4e3b6231d41c165ec0dd52fa6ca2e3913799)

ApiDocs.bp

diff --git a/ApiDocs.bp b/ApiDocs.bp
index 90df19a..a81342a 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -66,7 +66,7 @@
         ":opt-telephony-srcs",
         ":opt-net-voip-srcs",
         ":art-module-public-api-stubs-source",
-        ":conscrypt.module.public.api.stubs.source",
+        ":conscrypt.module.public.api{.public.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 6e6efe5..c0197c4 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -69,7 +69,7 @@
     name: "metalava-full-api-stubs-default",
     defaults: ["metalava-base-api-stubs-default"],
     srcs: [
-        ":conscrypt.module.public.api.stubs.source",
+        ":conscrypt.module.public.api{.public.stubs.source}",
         ":framework-updatable-sources",
     ],
     sdk_version: "core_platform",