From 6c6dde04bd38780b6ec09bca3f1bc3d10bc4019c Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 14 May 2021 15:52:25 +0100 Subject: Make uncompressDex available for use through hiddenAPIModule In order for the bootclasspath_fragment to perform dex encoding on its contents it needs to know whether the dex file is uncompressed or not. This change makes that information available by passing it to initHiddenAPI, storing it in hiddenAPI struct and providing access through the hiddenAPIModule. Bug: 179354495 Test: m droid Merged-In: I913416b4836766de194203fd8ed5124b61dfa3dd Change-Id: I913416b4836766de194203fd8ed5124b61dfa3dd (cherry picked from commit 1bbd0626f2d83036b4e1225cc51edfea5e4055b7) --- java/java.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index d4a52086e..45eb69339 100644 --- a/java/java.go +++ b/java/java.go @@ -1309,7 +1309,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.dexJarFile = dexOutputPath // Initialize the hiddenapi structure. - j.initHiddenAPI(ctx, dexOutputPath, outputFile) + j.initHiddenAPI(ctx, dexOutputPath, outputFile, nil) } 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. @@ -1341,10 +1341,10 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { } // Initialize the hiddenapi structure. - j.initHiddenAPI(ctx, dexOutputFile, outputFile) + j.initHiddenAPI(ctx, dexOutputFile, outputFile, j.dexProperties.Uncompress_dex) // Encode hidden API flags in dex file. - dexOutputFile = j.hiddenAPIEncodeDex(ctx, dexOutputFile, proptools.Bool(j.dexProperties.Uncompress_dex)) + dexOutputFile = j.hiddenAPIEncodeDex(ctx, dexOutputFile) j.dexJarFile = dexOutputFile } -- cgit v1.2.3