StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix build breakages when WITHOUT_CHECK_API=true" into rvc-dev

Browse Source
This commit is contained in:
Paul Duffin
2020-06-22 12:39:41 +00:00
committed by Android (Google) Code Review
parent 49d3a523bf 86672f6f4e
commit 4c21463f04
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/sdk_library.go
View File

@@ -2201,8 +2201,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
}
}