From 10269f1da9b99d682d1a86484b821344d7164bca Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 19 Jun 2020 18:39:55 +0100 Subject: Fix build breakages when WITHOUT_CHECK_API=true Bug: 158578354 Test: export WITHOUT_CHECK_API=true m checkbuild Change-Id: I7b5fff40b870c9d754f779ff1c3314bac7e42440 Merged-In: I7b5fff40b870c9d754f779ff1c3314bac7e42440 --- java/sdk_library.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'java/sdk_library.go') diff --git a/java/sdk_library.go b/java/sdk_library.go index 7ce0912e9..26bd6702f 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -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() - 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 } } -- cgit v1.2.3-59-g8ed1b