From c02e834ad6c3a46423e50322b034b4097462c337 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 27 Feb 2019 12:37:45 +0000 Subject: [PATCH] Revert "Support libraries (not just boot jars) that have hiddenapi" This reverts commit e5b5657f875be27cc8f8fcf3a1e6fa814d794c95. The reverted change was added in order to gather the information about the hiddenapi that is needed for the runtime to enforce the hiddenapi accessibility rules. Without it the build broke with the following error when the android.test.base library was not in the PRODUCT_BOOT_JARS list: AssertionError: Error processing: frameworks/base/config/hiddenapi-greylist.txt The following entries were unexpected: Ljunit/framework/TestSuite;->isPublicTestMethod(Ljava/lang/reflect/Method;)Z Landroid/test/AndroidTestCase;->setTestContext(Landroid/content/Context;)V Landroid/test/InstrumentationTestCase;->runMethod(Ljava/lang/reflect/Method;I)V Landroid/test/AndroidTestCase;->getTestContext()Landroid/content/Context; Ljunit/framework/TestCase;->fName:Ljava/lang/String; Ljunit/framework/TestSuite;->isTestMethod(Ljava/lang/reflect/Method;)Z Please visit go/hiddenapi for more information. However, it turns out that the runtime does not currently enforce access to the hiddenapi of libraries that are not on the PRODUCT_BOOT_JARS list. Gathering hiddenapi information for a library not on the PRODUCT_BOOT_JARS list breaks the CtsHiddenApiBlacklistApi27TestCases and CtsHiddenApiBlacklistApi28TestCases test modules which use that information to ensure that correct runtime behavior. This change is being reverted simply because it does not work. Bug: 126519737 Bug: 73711752 Test: make REMOVE_ATB_FROM_BCP=true droid and make droid Change-Id: I1b4a7786b1061effa0e2d37832afa8570953a06e --- java/config/config.go | 7 +------ java/hiddenapi.go | 14 ++------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/java/config/config.go b/java/config/config.go index 2602e6b04..75be9e21a 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -33,12 +33,7 @@ var ( DefaultLambdaStubsLibrary = "core-lambda-stubs" SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar" - // A list of the non-boot jars that provide hidden APIs, i.e. libraries. - HiddenAPIProvidingNonBootJars = []string{ - "android.test.base", - } - - // A list of the non-boot jars that provide information about usages of the hidden API. + // A list of the jars that provide information about usages of the hidden API. HiddenAPIExtraAppUsageJars = []string{ // The core-oj-hiddenapi provides information for the core-oj jar. "core-oj-hiddenapi", diff --git a/java/hiddenapi.go b/java/hiddenapi.go index 104cd767b..51ed3dda7 100644 --- a/java/hiddenapi.go +++ b/java/hiddenapi.go @@ -57,14 +57,7 @@ func (h *hiddenAPI) hiddenAPI(ctx android.ModuleContext, dexJar android.ModuleOu if !ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") { isBootJar := inList(ctx.ModuleName(), ctx.Config().BootJars()) - // Check to see if this module provides part of the hiddenapi, i.e. is a boot jar or a white listed - // library. - isProvidingJar := isBootJar || inList(ctx.ModuleName(), config.HiddenAPIProvidingNonBootJars) - - // If this module provides part of the hiddenapi or is a special module that simply provides information - // about the hiddenapi then extract information about the hiddenapi from the UnsupportedAppUsage - // annotations compiled into the classes.jar. - if isProvidingJar || inList(ctx.ModuleName(), config.HiddenAPIExtraAppUsageJars) { + if isBootJar || inList(ctx.ModuleName(), config.HiddenAPIExtraAppUsageJars) { // Derive the greylist from classes jar. flagsCSV := android.PathForModuleOut(ctx, "hiddenapi", "flags.csv") metadataCSV := android.PathForModuleOut(ctx, "hiddenapi", "metadata.csv") @@ -72,10 +65,7 @@ func (h *hiddenAPI) hiddenAPI(ctx android.ModuleContext, dexJar android.ModuleOu h.flagsCSVPath = flagsCSV h.metadataCSVPath = metadataCSV } - - // If this module provides part of the hiddenapi then encode the information about the hiddenapi into - // the dex file created for this module. - if isProvidingJar { + if isBootJar { hiddenAPIJar := android.PathForModuleOut(ctx, "hiddenapi", ctx.ModuleName()+".jar") h.bootDexJarPath = dexJar hiddenAPIEncodeDex(ctx, hiddenAPIJar, dexJar, uncompressDex)