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

Commit 58d100f8 authored by Jihoon Kang's avatar Jihoon Kang Committed by Android Build Coastguard Worker
Browse files

Create rule to generate the exportable api files when checkapi is disabled 

WITHOUT_CHECK_API environment variable enables the checkapi to be
removed from the critical path. The variable is rarely used within AOSP,
but the downstream vendors may depend on it, in order to improve the
build performance given that the api signature file through metalava is
a resource costly task.

Currently, the exportable api files / removed api files are not
generated when checkapi is disabled, but a module may depend on the
exportable api files when a checkapi is disabled. In order to prevent
the missing build rules error in this case, generate the rule to copy
the checked in api file / removed api file to the exportable api file /
removed api file to prevent build errors.

This change also fixes the error message when the OutputFiles(string)
api file is null, to correctly inform the user the error.

Test: m BUILD_FROM_SOURCE_STUB=true WITHOUT_CHECK_API=true && inspect ninja path and verify that "non-updatable-exportable-current.txt" depends on the generated exportable api file.
Bug: 329374072
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2d4074a022c0d836c712a6606b5c6e2cb376e07a)
Merged-In: I24f88d450fb46b6ea9d5920d83617d8228edd34b
Change-Id: I24f88d450fb46b6ea9d5920d83617d8228edd34b
parent 025dee55

java/droidstubs.go

+20 −13
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ func (d *Droidstubs) ApiFilePath(stubsType StubsType) (ret android.Path, err err 
		ret, err = nil, fmt.Errorf("api file path not supported for the stub type %s", stubsType.String())

	}

	if ret == nil && err == nil {

		err = fmt.Errorf("stubs srcjar is null for the stub type %s", stubsType.String())

		err = fmt.Errorf("api file is null for the stub type %s", stubsType.String())

	}

	return ret, err

}
@@ -478,34 +478,41 @@ func (d *Droidstubs) sdkValuesFlags(ctx android.ModuleContext, cmd *android.Rule 
}



func (d *Droidstubs) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuilderCommand, stubsDir android.OptionalPath, stubsType StubsType, checkApi bool) {

	if checkApi || String(d.properties.Api_filename) != "" {

		filename := proptools.StringDefault(d.properties.Api_filename, ctx.ModuleName()+"_api.txt")

		uncheckedApiFile := android.PathForModuleOut(ctx, stubsType.String(), filename)

		cmd.FlagWithOutput("--api ", uncheckedApiFile)



	apiFileName := proptools.StringDefault(d.properties.Api_filename, ctx.ModuleName()+"_api.txt")

	uncheckedApiFile := android.PathForModuleOut(ctx, stubsType.String(), apiFileName)

	cmd.FlagWithOutput("--api ", uncheckedApiFile)

	if checkApi || String(d.properties.Api_filename) != "" {

		if stubsType == Everything {

			d.apiFile = uncheckedApiFile

		} else if stubsType == Exportable {

			d.exportableApiFile = uncheckedApiFile

		}

	} else if sourceApiFile := proptools.String(d.properties.Check_api.Current.Api_file); sourceApiFile != "" {

		if stubsType == Everything {

			// If check api is disabled then make the source file available for export.

			d.apiFile = android.PathForModuleSrc(ctx, sourceApiFile)

		} else if stubsType == Exportable {

			d.exportableApiFile = uncheckedApiFile

		}

	}



	if checkApi || String(d.properties.Removed_api_filename) != "" {

		filename := proptools.StringDefault(d.properties.Removed_api_filename, ctx.ModuleName()+"_removed.txt")

		uncheckedRemovedFile := android.PathForModuleOut(ctx, stubsType.String(), filename)

	removedApiFileName := proptools.StringDefault(d.properties.Removed_api_filename, ctx.ModuleName()+"_removed.txt")

	uncheckedRemovedFile := android.PathForModuleOut(ctx, stubsType.String(), removedApiFileName)

	cmd.FlagWithOutput("--removed-api ", uncheckedRemovedFile)



	if checkApi || String(d.properties.Removed_api_filename) != "" {

		if stubsType == Everything {

			d.removedApiFile = uncheckedRemovedFile

		} else if stubsType == Exportable {

			d.exportableRemovedApiFile = uncheckedRemovedFile

		}

	} else if sourceRemovedApiFile := proptools.String(d.properties.Check_api.Current.Removed_api_file); sourceRemovedApiFile != "" {

		if stubsType == Everything {

			// If check api is disabled then make the source removed api file available for export.

			d.removedApiFile = android.PathForModuleSrc(ctx, sourceRemovedApiFile)

		} else if stubsType == Exportable {

			d.exportableRemovedApiFile = uncheckedRemovedFile

		}

	}



	if stubsDir.Valid() {