Merge "Fix build breakages when WITHOUT_CHECK_API=true"

This commit is contained in:
Treehugger Robot
2020-06-22 18:39:13 +00:00
committed by Gerrit Code Review
2 changed files with 20 additions and 10 deletions

View File

@@ -2193,8 +2193,12 @@ func (s *sdkLibrarySdkMemberProperties) PopulateFromVariant(ctx android.SdkMembe
properties.Jars = jars
properties.SdkVersion = sdk.sdkVersionForStubsLibrary(ctx.SdkModuleContext(), apiScope)
properties.StubsSrcJar = paths.stubsSrcJar.Path()
properties.CurrentApiFile = paths.currentApiFilePath.Path()
properties.RemovedApiFile = paths.removedApiFilePath.Path()
if paths.currentApiFilePath.Valid() {
properties.CurrentApiFile = paths.currentApiFilePath.Path()
}
if paths.removedApiFilePath.Valid() {
properties.RemovedApiFile = paths.removedApiFilePath.Path()
}
s.Scopes[apiScope] = properties
}
}