From 8fc51a8eb6ca20dbb4b65822123201568bb297f1 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 6 Jul 2021 10:55:35 +0100 Subject: Switch boot image generation to use GetGlobalSoongConfig(ctx) Previously, boot image generation used GetCachedGlobalSoongConfig(ctx) in order to get access to the GlobalSoongConfig. That required that some other part of the code had called GetGlobalSoongConfig(ctx) to initialize the cached value. That was left over from when the boot image generation was done in a singleton which could not call GetGlobalSoongConfig(ctx) directly. That is no longer true. This change switches the uses of GetCachedGlobalSoongConfig(ctx) to GetGlobalSoongConfig(ctx) and removes the now unnecessary call to GetGlobalSoongConfig(ctx) from outside the functions. Bug: 192575099 Test: m nothing Change-Id: I34b7b1526d072d8b09fda7caa96e381695888e16 --- java/bootclasspath_fragment.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'java/bootclasspath_fragment.go') diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index ebd22cfa1..901e65a81 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -674,10 +674,6 @@ func (b *BootclasspathFragmentModule) produceBootImageFiles(ctx android.ModuleCo return nil } - // Force the GlobalSoongConfig to be created and cached for use by the dex_bootjars - // GenerateSingletonBuildActions method as it cannot create it for itself. - dexpreopt.GetGlobalSoongConfig(ctx) - // Only generate the boot image if the configuration does not skip it. return b.generateBootImageBuildActions(ctx, imageConfig) } -- cgit v1.2.3-59-g8ed1b