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

Commit 10269f1d authored by Paul Duffin's avatar Paul Duffin
Browse files

Fix build breakages when WITHOUT_CHECK_API=true 

Bug: 158578354
Test: export WITHOUT_CHECK_API=true
      m checkbuild
Change-Id: I7b5fff40b870c9d754f779ff1c3314bac7e42440
Merged-In: I7b5fff40b870c9d754f779ff1c3314bac7e42440
parent 1a1e1f88

java/droiddoc.go

+14 −8
Original line number Diff line number Diff line
@@ -1414,7 +1414,7 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a 
}



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

	if Bool(d.properties.Jdiff_enabled) && !ctx.Config().IsPdkBuild() {

	if Bool(d.properties.Jdiff_enabled) && !ctx.Config().IsPdkBuild() && d.apiFile != nil {

		if d.apiFile.String() == "" {

			ctx.ModuleErrorf("API signature file has to be specified in Metalava when jdiff is enabled.")

		}
@@ -1835,13 +1835,19 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
			Flag("-XDignore.symbol.file").

			FlagWithArg("-doclet ", "jdiff.JDiff").

			FlagWithInput("-docletpath ", jdiff).

			Flag("-quiet").

			FlagWithArg("-newapi ", strings.TrimSuffix(d.apiXmlFile.Base(), d.apiXmlFile.Ext())).

			Flag("-quiet")



		if d.apiXmlFile != nil {

			cmd.FlagWithArg("-newapi ", strings.TrimSuffix(d.apiXmlFile.Base(), d.apiXmlFile.Ext())).

				FlagWithArg("-newapidir ", filepath.Dir(d.apiXmlFile.String())).

			Implicit(d.apiXmlFile).

			FlagWithArg("-oldapi ", strings.TrimSuffix(d.lastReleasedApiXmlFile.Base(), d.lastReleasedApiXmlFile.Ext())).

				Implicit(d.apiXmlFile)

		}



		if d.lastReleasedApiXmlFile != nil {

			cmd.FlagWithArg("-oldapi ", strings.TrimSuffix(d.lastReleasedApiXmlFile.Base(), d.lastReleasedApiXmlFile.Ext())).

				FlagWithArg("-oldapidir ", filepath.Dir(d.lastReleasedApiXmlFile.String())).

				Implicit(d.lastReleasedApiXmlFile)

		}



		rule.Command().

			BuiltTool(ctx, "soong_zip").

java/sdk_library.go

+6 −2
Original line number Diff line number Diff line
@@ -2188,8 +2188,12 @@ func (s *sdkLibrarySdkMemberProperties) PopulateFromVariant(ctx android.SdkMembe 
			properties.Jars = jars

			properties.SdkVersion = sdk.sdkVersionForStubsLibrary(ctx.SdkModuleContext(), apiScope)

			properties.StubsSrcJar = paths.stubsSrcJar.Path()

			if paths.currentApiFilePath.Valid() {

				properties.CurrentApiFile = paths.currentApiFilePath.Path()

			}

			if paths.removedApiFilePath.Valid() {

				properties.RemovedApiFile = paths.removedApiFilePath.Path()

			}

			s.Scopes[apiScope] = properties

		}

	}