From 1bbd0626f2d83036b4e1225cc51edfea5e4055b7 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 Change-Id: I913416b4836766de194203fd8ed5124b61dfa3dd --- java/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/base.go') diff --git a/java/base.go b/java/base.go index 4b56a300b..c828503d4 100644 --- a/java/base.go +++ b/java/base.go @@ -1218,10 +1218,10 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { } // Initialize the hiddenapi structure. - j.initHiddenAPI(ctx, dexOutputFile, j.implementationJarFile) + j.initHiddenAPI(ctx, dexOutputFile, j.implementationJarFile, 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) // merge dex jar with resources if necessary if j.resourceJar != nil { -- cgit v1.2.3-59-g8ed1b