From 22ff0aaf51bdd9409eafe74151decb58f47308bc Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 4 Feb 2021 11:15:34 +0000 Subject: Export implementation class jars for java_boot_libs Hiddenapi processing currently requires access to the class implementation jars for libraries on the bootclasspath which means that they need to be provided as part of the prebuilts. This change modifies the java_boot_libs property on the sdk to make those files available. Modularization of the hiddenapi processing will hopefully remove the need for these to be exported so this should be temporary. Bug: 178361284 Test: m art-module-sdk check generated snapshot zip contains implementation jars Change-Id: I9e94662dddb0ddb85a477ae6d27e533085147e88 --- sdk/java_sdk_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sdk/java_sdk_test.go') diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 488afd84e..17a6ca9b8 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -503,7 +503,7 @@ java_import { sdk_member_name: "myjavalib", visibility: ["//visibility:public"], apex_available: ["//apex_available:platform"], - jars: ["java_boot_libs/snapshot/jars/are/invalid/myjavalib.jar"], + jars: ["java/myjavalib.jar"], } java_import { @@ -511,7 +511,7 @@ java_import { prefer: false, visibility: ["//visibility:public"], apex_available: ["//apex_available:platform"], - jars: ["java_boot_libs/snapshot/jars/are/invalid/myjavalib.jar"], + jars: ["java/myjavalib.jar"], } module_exports_snapshot { @@ -519,10 +519,9 @@ module_exports_snapshot { visibility: ["//visibility:public"], java_boot_libs: ["myexports_myjavalib@current"], } - `), checkAllCopyRules(` -.intermediates/myexports/common_os/empty -> java_boot_libs/snapshot/jars/are/invalid/myjavalib.jar +.intermediates/myjavalib/android_common/withres/myjavalib.jar -> java/myjavalib.jar `), ) } -- cgit v1.2.3-59-g8ed1b