diff options
| author | Paul Duffin <paulduffin@google.com> | 2020-06-19 18:39:55 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2020-06-19 19:15:29 +0100 |
| commit | 86672f6f4e7277f7d6b6a5c15021f4c00cf5baed (patch) | |
| tree | df996dd5dd6371e60d39a3d6b6c7d481c57a77e5 | |
| parent | fc14a1383b2e5268cb42770a01cd1aa320935521 (diff) | |
| download | build_soong-86672f6f4e7277f7d6b6a5c15021f4c00cf5baed.tar.gz build_soong-86672f6f4e7277f7d6b6a5c15021f4c00cf5baed.tar.bz2 build_soong-86672f6f4e7277f7d6b6a5c15021f4c00cf5baed.zip | |
Fix build breakages when WITHOUT_CHECK_API=true
Bug: 158578354
Test: export WITHOUT_CHECK_API=true
m checkbuild
Change-Id: I7b5fff40b870c9d754f779ff1c3314bac7e42440
| -rw-r--r-- | java/droiddoc.go | 22 | ||||
| -rw-r--r-- | java/sdk_library.go | 8 |
2 files changed, 20 insertions, 10 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index 8db688fe..6a5f2891 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -1399,7 +1399,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.") } @@ -1830,13 +1830,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())). - FlagWithArg("-newapidir ", filepath.Dir(d.apiXmlFile.String())). - Implicit(d.apiXmlFile). - FlagWithArg("-oldapi ", strings.TrimSuffix(d.lastReleasedApiXmlFile.Base(), d.lastReleasedApiXmlFile.Ext())). - FlagWithArg("-oldapidir ", filepath.Dir(d.lastReleasedApiXmlFile.String())). - Implicit(d.lastReleasedApiXmlFile) + 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) + } + + 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"). diff --git a/java/sdk_library.go b/java/sdk_library.go index c97a04a5..82888d1a 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -2182,8 +2182,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 } } |