From 90b8ad38e08ede09d3c62d1a2b60f2a8f51afe8a Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 13 Apr 2021 12:25:01 +0100 Subject: [PATCH] Remove noop code from generateHiddenAPIBuildActions Change https://r.android.com/1673266 introduced some code that does nothing. This change removes that. Bug: 177892522 Test: m nothing Change-Id: I349b17c7fe7e2f68a807dab43a4300da7fe0ad4d --- java/platform_bootclasspath.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 86ab70865..fa13332dc 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -261,16 +261,10 @@ func (b *platformBootclasspathModule) getImageConfig(ctx android.EarlyModuleCont // generateHiddenAPIBuildActions generates all the hidden API related build rules. func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android.ModuleContext, modules []android.Module) { - // Save the paths to the monolithic files for retrieval via OutputFiles() - // Make the paths relative to the out/soong/hiddenapi directory instead of to the out/soong/ - // directory. This ensures that if they are used as java_resources they do not end up in a - // hiddenapi directory in the resulting APK. - relToHiddenapiDir := func(path android.OutputPath) android.Path { - return path - } - b.hiddenAPIFlagsCSV = relToHiddenapiDir(hiddenAPISingletonPaths(ctx).flags) - b.hiddenAPIIndexCSV = relToHiddenapiDir(hiddenAPISingletonPaths(ctx).index) - b.hiddenAPIMetadataCSV = relToHiddenapiDir(hiddenAPISingletonPaths(ctx).metadata) + // Save the paths to the monolithic files for retrieval via OutputFiles(). + b.hiddenAPIFlagsCSV = hiddenAPISingletonPaths(ctx).flags + b.hiddenAPIIndexCSV = hiddenAPISingletonPaths(ctx).index + b.hiddenAPIMetadataCSV = hiddenAPISingletonPaths(ctx).metadata moduleSpecificFlagsPaths := android.Paths{} for _, module := range modules {