Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31a68568 authored by Paul Duffin's avatar Paul Duffin
Browse files

Make ruleToGenerateHiddenAPIStubFlagsFile build rule 

Previously, the func created a rule and returned it for the caller to
create with the appropriate name and description. This change passes
the name and description into the func and causes it to create the rule
itself. The func is also renamed to make it more consistent with the
other similar rules.

Bug: 179354495
Test: m nothing
Merged-In: I2a4455daa8a6090ed5568994b255848d063e1ab2
Change-Id: I2a4455daa8a6090ed5568994b255848d063e1ab2
(cherry picked from commit 4539a37a)
parent 5c6f03cf

java/hiddenapi_modular.go

+5 −5
Original line number Diff line number Diff line
@@ -232,11 +232,11 @@ func hiddenAPIRetrieveDexJarBuildPath(ctx android.ModuleContext, module android. 
	return dexJar

}



// ruleToGenerateHiddenAPIStubFlagsFile creates a rule to create a hidden API stub flags file.

// buildRuleToGenerateHiddenAPIStubFlagsFile creates a rule to create a hidden API stub flags file.

//

// The rule is initialized but not built so that the caller can modify it and select an appropriate

// name.

func ruleToGenerateHiddenAPIStubFlagsFile(ctx android.BuilderContext, outputPath android.WritablePath, bootDexJars android.Paths, input HiddenAPIFlagInput) *android.RuleBuilder {

func buildRuleToGenerateHiddenAPIStubFlagsFile(ctx android.BuilderContext, name, desc string, outputPath android.WritablePath, bootDexJars android.Paths, input HiddenAPIFlagInput) {

	// Singleton rule which applies hiddenapi on all boot class path dex files.

	rule := android.NewRuleBuilder(pctx, ctx)
@@ -277,7 +277,8 @@ func ruleToGenerateHiddenAPIStubFlagsFile(ctx android.BuilderContext, outputPath 
	command.FlagWithOutput("--out-api-flags=", tempPath)



	commitChangeForRestat(rule, tempPath, outputPath)

	return rule



	rule.Build(name, desc)

}



// HiddenAPIFlagFileProperties contains paths to the flag files that can be used to augment the
@@ -792,8 +793,7 @@ func hiddenAPIRulesForBootclasspathFragment(ctx android.ModuleContext, contents 


	// Generate the stub-flags.csv.

	stubFlagsCSV := android.PathForModuleOut(ctx, hiddenApiSubDir, "stub-flags.csv")

	rule := ruleToGenerateHiddenAPIStubFlagsFile(ctx, stubFlagsCSV, bootDexInfoByModule.bootDexJars(), input)

	rule.Build("modularHiddenAPIStubFlagsFile", "modular hiddenapi stub flags")

	buildRuleToGenerateHiddenAPIStubFlagsFile(ctx, "modularHiddenAPIStubFlagsFile", "modular hiddenapi stub flags", stubFlagsCSV, bootDexInfoByModule.bootDexJars(), input)



	// Extract the classes jars from the contents.

	classesJars := extractClassesJarsFromModules(contents)

java/platform_bootclasspath.go

+2 −3
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. 
	// the fragments will have already provided the flags that are needed.

	classesJars := monolithicInfo.ClassesJars



	// Create the input to pass to ruleToGenerateHiddenAPIStubFlagsFile

	// Create the input to pass to buildRuleToGenerateHiddenAPIStubFlagsFile

	input := newHiddenAPIFlagInput()



	// Gather stub library information from the dependencies on modules provided by
@@ -299,8 +299,7 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. 


	// Generate the monolithic stub-flags.csv file.

	stubFlags := hiddenAPISingletonPaths(ctx).stubFlags

	rule := ruleToGenerateHiddenAPIStubFlagsFile(ctx, stubFlags, bootDexJarByModule.bootDexJars(), input)

	rule.Build("platform-bootclasspath-monolithic-hiddenapi-stub-flags", "monolithic hidden API stub flags")

	buildRuleToGenerateHiddenAPIStubFlagsFile(ctx, "platform-bootclasspath-monolithic-hiddenapi-stub-flags", "monolithic hidden API stub flags", stubFlags, bootDexJarByModule.bootDexJars(), input)



	// Generate the annotation-flags.csv file from all the module annotations.

	annotationFlags := android.PathForModuleOut(ctx, "hiddenapi-monolithic", "annotation-flags-from-classes.csv")