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

Commit a11d679d authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Revert "Additional cleanup prior to adding the runtime stubs" 

Revert submission 2929615

Reason for revert: b/328225000

Reverted changes: /q/submissionid:2929615

Merged-In: I29c605adb9401c9cb8b58646f2ae7b53b9a758e9
Change-Id: I29c605adb9401c9cb8b58646f2ae7b53b9a758e9
parent d40c5914

java/droidstubs.go

+45 −53
Original line number Diff line number Diff line
@@ -239,8 +239,6 @@ type stubsCommandConfigParams struct { 
	writeSdkValues        bool

	migratingNullability  bool

	validatingNullability bool

	annotationsEnabled          bool

	apiLevelsAnnotationsEnabled bool

}



// droidstubs passes sources files through Metalava to generate stub .java files that only contain the API to be
@@ -510,6 +508,7 @@ func (d *Droidstubs) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuil 
}



func (d *Droidstubs) annotationsFlags(ctx android.ModuleContext, cmd *android.RuleBuilderCommand, params annotationFlagsParams) {

	if Bool(d.properties.Annotations_enabled) {

		cmd.Flag(config.MetalavaAnnotationsFlags)



		if params.migratingNullability {
@@ -533,6 +532,7 @@ func (d *Droidstubs) annotationsFlags(ctx android.ModuleContext, cmd *android.Ru 


		cmd.Flag(config.MetalavaAnnotationsWarningsFlags)

	}

}



func (d *Droidstubs) mergeAnnoDirFlags(ctx android.ModuleContext, cmd *android.RuleBuilderCommand) {

	ctx.VisitDirectDepsWithTag(metalavaMergeAnnotationsDirTag, func(m android.Module) {
@@ -556,11 +556,9 @@ func (d *Droidstubs) inclusionAnnotationsFlags(ctx android.ModuleContext, cmd *a 
	})

}



func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *android.RuleBuilderCommand, params stubsCommandParams) {

func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *android.RuleBuilderCommand, stubsType StubsType, apiVersionsXml android.WritablePath) {

	var apiVersions android.Path

	stubsType := params.stubConfig.stubsType

	apiVersionsXml := params.apiVersionsXml

	if params.stubConfig.apiLevelsAnnotationsEnabled {

	if proptools.Bool(d.properties.Api_levels_annotations_enabled) {

		d.apiLevelsGenerationFlags(ctx, cmd, stubsType, apiVersionsXml)

		apiVersions = apiVersionsXml

	} else {
@@ -809,11 +807,9 @@ func (d *Droidstubs) commonMetalavaStubCmd(ctx android.ModuleContext, rule *andr 
		annotationsZip:          params.annotationsZip,

	}



	if params.stubConfig.annotationsEnabled {

	d.annotationsFlags(ctx, cmd, annotationParams)

	}

	d.inclusionAnnotationsFlags(ctx, cmd)

	d.apiLevelsAnnotationsFlags(ctx, cmd, params)

	d.apiLevelsAnnotationsFlags(ctx, cmd, params.stubConfig.stubsType, params.apiVersionsXml)



	d.expandArgs(ctx, cmd)
@@ -843,13 +839,13 @@ func (d *Droidstubs) everythingStubCmd(ctx android.ModuleContext, params stubsCo 
		d.everythingArtifacts.metadataZip = android.PathForModuleOut(ctx, Everything.String(), ctx.ModuleName()+"-metadata.zip")

	}



	if params.annotationsEnabled {

	if Bool(d.properties.Annotations_enabled) {

		if params.validatingNullability {

			d.everythingArtifacts.nullabilityWarningsFile = android.PathForModuleOut(ctx, Everything.String(), ctx.ModuleName()+"_nullability_warnings.txt")

		}

		d.everythingArtifacts.annotationsZip = android.PathForModuleOut(ctx, Everything.String(), ctx.ModuleName()+"_annotations.zip")

	}

	if params.apiLevelsAnnotationsEnabled {

	if Bool(d.properties.Api_levels_annotations_enabled) {

		d.everythingArtifacts.apiVersionsXml = android.PathForModuleOut(ctx, Everything.String(), "api-versions.xml")

	}
@@ -1027,7 +1023,7 @@ func (d *Droidstubs) exportableStubCmd(ctx android.ModuleContext, params stubsCo 
		optionalCmdParams.metadataDir = d.exportableArtifacts.metadataDir

	}



	if params.annotationsEnabled {

	if Bool(d.properties.Annotations_enabled) {

		if params.validatingNullability {

			d.exportableArtifacts.nullabilityWarningsFile = android.PathForModuleOut(ctx, params.stubsType.String(), ctx.ModuleName()+"_nullability_warnings.txt")

			optionalCmdParams.nullabilityWarningsFile = d.exportableArtifacts.nullabilityWarningsFile
@@ -1035,7 +1031,7 @@ func (d *Droidstubs) exportableStubCmd(ctx android.ModuleContext, params stubsCo 
		d.exportableArtifacts.annotationsZip = android.PathForModuleOut(ctx, params.stubsType.String(), ctx.ModuleName()+"_annotations.zip")

		optionalCmdParams.annotationsZip = d.exportableArtifacts.annotationsZip

	}

	if params.apiLevelsAnnotationsEnabled {

	if Bool(d.properties.Api_levels_annotations_enabled) {

		d.exportableArtifacts.apiVersionsXml = android.PathForModuleOut(ctx, params.stubsType.String(), "api-versions.xml")

		optionalCmdParams.apiVersionsXml = d.exportableArtifacts.apiVersionsXml

	}
@@ -1131,8 +1127,6 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	checkApi := apiCheckEnabled(ctx, d.properties.Check_api.Current, "current") ||

		apiCheckEnabled(ctx, d.properties.Check_api.Last_released, "last_released")



	apiLevelsAnnotationsEnabled := proptools.Bool(d.properties.Api_levels_annotations_enabled)



	stubCmdParams := stubsCommandConfigParams{

		javaVersion:           javaVersion,

		deps:                  deps,
@@ -1143,8 +1137,6 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		writeSdkValues:        writeSdkValues,

		migratingNullability:  migratingNullability,

		validatingNullability: validatingNullability,

		annotationsEnabled:          annotationsEnabled,

		apiLevelsAnnotationsEnabled: apiLevelsAnnotationsEnabled,

	}

	stubCmdParams.stubsType = Everything

	// Create default (i.e. "everything" stubs) rule for metalava