From bf48c955ab22cee2a682934f97bdbbd82186cecc Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 14 May 2020 17:55:46 +0100 Subject: [PATCH] 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 | 2 +- StubLibraries.bp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ApiDocs.bp b/ApiDocs.bp index 90df19a9491ac..a81342a5160f9 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -66,7 +66,7 @@ stubs_defaults { ":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", diff --git a/StubLibraries.bp b/StubLibraries.bp index 6e6efe50309a3..c0197c4b2acfb 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -69,7 +69,7 @@ stubs_defaults { 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",