From 7110ae7a28399f50cf40f080063260d69c95ea37 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 15 Oct 2020 17:23:35 +0100 Subject: Remove module source code from test-api-stubs-docs This makes it impossible to add new @TestApi in modules, of which there are none right now and we don't want any going forwards, either. Bug: 170395679 Test: m test-api-stubs-docs-check-current-api Change-Id: I527ca7b580350372bee72b65f6596a46eab2ce04 Merged-In: I527ca7b580350372bee72b65f6596a46eab2ce04 --- StubLibraries.bp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'StubLibraries.bp') diff --git a/StubLibraries.bp b/StubLibraries.bp index 97fa28fc9e97..39aa732d929b 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -225,7 +225,7 @@ droidstubs { droidstubs { name: "test-api-stubs-docs", - defaults: ["metalava-full-api-stubs-default"], + defaults: ["metalava-non-updatable-api-stubs-default"], arg_files: [ "core/res/AndroidManifest.xml", ], @@ -414,7 +414,19 @@ java_library_static { java_library_static { name: "android_test_stubs_current", srcs: [ ":test-api-stubs-docs" ], - static_libs: [ "private-stub-annotations-jar" ], + 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. + "conscrypt.module.public.api.stubs", + "framework-media.stubs.system", + "framework-mediaprovider.stubs.system", + "framework-permission.stubs.system", + "framework-sdkextensions.stubs.system", + "framework-statsd.stubs.system", + "framework-tethering.stubs.system", + "framework-wifi.stubs.system", + "private-stub-annotations-jar", + ], defaults: [ "android_defaults_stubs_current", "android_stubs_dists_default", -- cgit v1.2.3