diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/java/java.go b/java/java.go index 9d2074fe3..4a7d70438 100644 --- a/java/java.go +++ b/java/java.go @@ -538,8 +538,8 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt } type deps struct { - classpath android.Paths - bootClasspath android.Paths + classpath classpath + bootClasspath classpath staticJars android.Paths staticHeaderJars android.Paths staticJarResources android.Paths @@ -688,8 +688,8 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB } // classpath - flags.bootClasspath.AddPaths(deps.bootClasspath) - flags.classpath.AddPaths(deps.classpath) + flags.bootClasspath = append(flags.bootClasspath, deps.bootClasspath...) + flags.classpath = append(flags.classpath, deps.classpath...) if len(flags.bootClasspath) == 0 && ctx.Host() && !ctx.Config().TargetOpenJDK9() && !Bool(j.properties.No_standard_libs) && @@ -836,7 +836,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path } if enable_sharding { - flags.classpath.AddPaths([]android.Path{j.headerJarFile}) + flags.classpath = append(flags.classpath, j.headerJarFile) shardSize := int(*(j.properties.Javac_shard_size)) var shardSrcs []android.Paths if len(uniqueSrcFiles) > 0 { @@ -1252,15 +1252,6 @@ func ImportFactoryHost() android.Module { return module } -func inList(s string, l []string) bool { - for _, e := range l { - if e == s { - return true - } - } - return false -} - // // Defaults // @@ -1295,3 +1286,4 @@ func DefaultsFactory(props ...interface{}) android.Module { var Bool = proptools.Bool var String = proptools.String +var inList = android.InList |