From 34827d4c0ec854bee766ec3db2be6e66b34ebb28 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 13 May 2021 21:25:05 +0100 Subject: Use java_sdk_library in bootclasspath_fragment contents as stubs A java_sdk_library specified in the bootclasspath_fragment contents must be providing APIs for the bootclasspath_fragment and so must be treated as if they were specified in the stub_libs. This avoids having to specify them in both contents and stub_libs. Bug: 179354495 Test: m nothing Change-Id: I535065ee1a79b439e2676f35e06a75d4626adcaf --- java/platform_bootclasspath.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/platform_bootclasspath.go') diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index b5fec95fe..5880e2f0a 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -377,7 +377,7 @@ func (b *platformBootclasspathModule) generateHiddenAPIStubFlagsRules(ctx androi bootDexJars = append(bootDexJars, module.bootDexJar) } - sdkKindToStubPaths := hiddenAPIGatherStubLibDexJarPaths(ctx) + sdkKindToStubPaths := hiddenAPIGatherStubLibDexJarPaths(ctx, nil) outputPath := hiddenAPISingletonPaths(ctx).stubFlags rule := ruleToGenerateHiddenAPIStubFlagsFile(ctx, outputPath, bootDexJars, sdkKindToStubPaths) -- cgit v1.2.3-59-g8ed1b