diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 5 | ||||
| -rw-r--r-- | java/droiddoc.go | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/java/app.go b/java/app.go index 78d526db4..3f72ec9b2 100644 --- a/java/app.go +++ b/java/app.go @@ -208,7 +208,7 @@ func AndroidAppFactory() android.Module { &module.aaptProperties, &module.appProperties) - android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + InitJavaModule(module, android.DeviceSupported) return module } @@ -261,7 +261,6 @@ func AndroidTestFactory() android.Module { &module.appTestProperties, &module.testProperties) - android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) - + InitJavaModule(module, android.DeviceSupported) return module } diff --git a/java/droiddoc.go b/java/droiddoc.go index f90c548f5..104e46dcd 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -950,9 +950,8 @@ func (d *Droiddoc) collectMetalavaAnnotationsFlags( previousApi := ctx.ExpandSource(String(d.properties.Metalava_previous_api), "metalava_previous_api") *implicits = append(*implicits, previousApi) - flags += " --previous-api " + previousApi.String() - flags += " --include-annotations --migrate-nullness" + flags += " --include-annotations --migrate-nullness " + previousApi.String() d.annotationsZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"_annotations.zip") *implicitOutputs = append(*implicitOutputs, d.annotationsZip) |