From 9b61abbd840503dd9bd2eebf7fee8be627be4eb5 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 27 Jul 2022 16:16:54 +0000 Subject: Push Hidden_api inside HiddenAPIFlagFileProperties All usages of HiddenAPIFlagFileProperties use it as the type of a Hidden_api field. This change pushes the field inside the struct and just embeds the struct inside the structs that need it making it simpler and more consistent with how the HiddenApiPackageProperties struct is used. This is extracted as a separate change as while the change is simple it does affect a lot of lines. Keeping it separate makes it easier to review the changes. Bug: 240406019 Test: packages/modules/common/build/mainline_modules_sdks.sh # Ran the previous command with and without this change to make # sure that this change does not change the sdk snapshot # contents. Change-Id: I664453029574ef68dc5712f7bf137a1a6e78e864 --- java/platform_bootclasspath.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/platform_bootclasspath.go') diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 1e2723845..24f8253ae 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -62,7 +62,7 @@ type platformBootclasspathModule struct { type platformBootclasspathProperties struct { BootclasspathFragmentsDepsProperties - Hidden_api HiddenAPIFlagFileProperties + HiddenAPIFlagFileProperties } func platformBootclasspathFactory() android.SingletonModule { @@ -372,7 +372,7 @@ func (b *platformBootclasspathModule) createAndProvideMonolithicHiddenAPIInfo(ct temporaryInput := newHiddenAPIFlagInput() // Create paths to the flag files specified in the properties. - temporaryInput.extractFlagFilesFromProperties(ctx, &b.properties.Hidden_api) + temporaryInput.extractFlagFilesFromProperties(ctx, &b.properties.HiddenAPIFlagFileProperties) // Create the monolithic info, by starting with the flag files specified on this and then merging // in information from all the fragment dependencies of this. -- cgit v1.2.3-59-g8ed1b