summaryrefslogtreecommitdiff
path: root/java/sdk_library.go
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-06-22 18:39:13 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-06-22 18:39:13 +0000
commitea34d87759a70da45d95f37f8df4d4c917144d45 (patch)
tree1acdd5756af272ef78dc2525806a27a536e2f4d3 /java/sdk_library.go
parent34753055d1e3df3f6b7a22996f2d499d70e23b36 (diff)
parent10269f1da9b99d682d1a86484b821344d7164bca (diff)
Merge "Fix build breakages when WITHOUT_CHECK_API=true"
Diffstat (limited to 'java/sdk_library.go')
-rw-r--r--java/sdk_library.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 782c94adc..676557e64 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -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
}
}