From afaa47c74afff8be502b6ba8d0139abfc4f5135d Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 14 May 2021 13:04:04 +0100 Subject: Stop generating unnecessary hidden API rules The rules to extract hidden API information from an individual module in order to create module specific files are no longer necessary as the monolithic files are created directly from the module's class jars and not the module specific files. Bug: 179354495 Test: verified that the monolithic out/soong/hiddenapi/... files are unchanged by this change Change-Id: I573ac17f3ea5da5a2a7e4f08718160dacca71c0c --- java/java.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 9a5fbfc35..f85de3d77 100644 --- a/java/java.go +++ b/java/java.go @@ -1315,7 +1315,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { di := ctx.OtherModuleProvider(deapexerModule, android.DeapexerProvider).(android.DeapexerInfo) if dexOutputPath := di.PrebuiltExportPath(j.BaseModuleName(), ".dexjar"); dexOutputPath != nil { j.dexJarFile = dexOutputPath - j.hiddenAPIExtractInformation(ctx, dexOutputPath, outputFile) + j.hiddenAPIUpdatePaths(ctx, dexOutputPath, outputFile) } else { // This should never happen as a variant for a prebuilt_apex is only created if the // prebuilt_apex has been configured to export the java library dex file. @@ -1346,9 +1346,11 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { return } - // Hidden API CSV generation and dex encoding - dexOutputFile = j.hiddenAPIExtractAndEncode(ctx, dexOutputFile, outputFile, - proptools.Bool(j.dexProperties.Uncompress_dex)) + // Update hidden API paths. + j.hiddenAPIUpdatePaths(ctx, dexOutputFile, outputFile) + + // Encode hidden API flags in dex file. + dexOutputFile = j.hiddenAPIEncodeDex(ctx, dexOutputFile, proptools.Bool(j.dexProperties.Uncompress_dex)) j.dexJarFile = dexOutputFile } -- cgit v1.2.3-59-g8ed1b