diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/bootclasspath_fragment.go | 11 | ||||
| -rw-r--r-- | java/droiddoc.go | 17 | ||||
| -rw-r--r-- | java/droidstubs.go | 11 |
3 files changed, 12 insertions, 27 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 792193f9f..1c7ad78ec 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -516,7 +516,16 @@ func (b *BootclasspathFragmentModule) ClasspathFragmentToConfiguredJarList(ctx a // Only create configs for updatable boot jars. Non-updatable boot jars must be part of the // platform_bootclasspath's classpath proto config to guarantee that they come before any // updatable jars at runtime. - return global.UpdatableBootJars.Filter(stems) + jars := global.UpdatableBootJars.Filter(stems) + + // TODO(satayev): for apex_test we want to include all contents unconditionally to classpaths + // config. However, any test specific jars would not be present in UpdatableBootJars. Instead, + // we should check if we are creating a config for apex_test via ApexInfo and amend the values. + // This is an exception to support end-to-end test for SdkExtensions, until such support exists. + if android.InList("test_framework-sdkextensions", stems) { + jars = jars.Append("com.android.sdkext", "test_framework-sdkextensions") + } + return jars } func (b *BootclasspathFragmentModule) getImageConfig(ctx android.EarlyModuleContext) *bootImageConfig { diff --git a/java/droiddoc.go b/java/droiddoc.go index 56e62473f..869a5982d 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -425,23 +425,6 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps { } srcFiles = filterByPackage(srcFiles, j.properties.Filter_packages) - // While metalava needs package html files, it does not need them to be explicit on the command - // line. javadoc complains if it receives html files on the command line. The filter - // below excludes html files from the rsp file metalava. Note that the html - // files are still included as implicit inputs for successful remote execution and correct - // incremental builds. - filterHtml := func(srcs []android.Path) []android.Path { - filtered := []android.Path{} - for _, src := range srcs { - if src.Ext() == ".html" { - continue - } - filtered = append(filtered, src) - } - return filtered - } - srcFiles = filterHtml(srcFiles) - aidlFlags := j.collectAidlFlags(ctx, deps) srcFiles = j.genSources(ctx, srcFiles, aidlFlags) diff --git a/java/droidstubs.go b/java/droidstubs.go index 17c7a7bf7..d348b5556 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -392,8 +392,7 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a } func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersion javaVersion, srcs android.Paths, - srcJarList android.Path, bootclasspath, classpath classpath, sourcepaths android.Paths, - homeDir android.WritablePath) *android.RuleBuilderCommand { + srcJarList android.Path, bootclasspath, classpath classpath, homeDir android.WritablePath) *android.RuleBuilderCommand { rule.Command().Text("rm -rf").Flag(homeDir.String()) rule.Command().Text("mkdir -p").Flag(homeDir.String()) @@ -430,12 +429,6 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi cmd.FlagWithInputList("-classpath ", classpath.Paths(), ":") } - if len(sourcepaths) > 0 { - cmd.FlagWithList("-sourcepath ", sourcepaths.Strings(), ":") - } else { - cmd.FlagWithArg("-sourcepath ", `""`) - } - cmd.Flag("--no-banner"). Flag("--color"). Flag("--quiet"). @@ -479,7 +472,7 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) { homeDir := android.PathForModuleOut(ctx, "metalava", "home") cmd := metalavaCmd(ctx, rule, javaVersion, d.Javadoc.srcFiles, srcJarList, - deps.bootClasspath, deps.classpath, d.Javadoc.sourcepaths, homeDir) + deps.bootClasspath, deps.classpath, homeDir) cmd.Implicits(d.Javadoc.implicits) d.stubsFlags(ctx, cmd, stubsDir) |