diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-23 02:28:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-23 02:28:35 +0000 |
| commit | 1b5599e462411b4f0d1f932865f302b74f7b3e35 (patch) | |
| tree | 439c9aae14934eda141996bf5843be26cc387137 /java | |
| parent | 336ad7a6676515ec1f2a432ca176af62ff180155 (diff) | |
| parent | 9d37831dd3f5a8133c0fc353ce1993e1585aa178 (diff) | |
| download | build_soong-1b5599e462411b4f0d1f932865f302b74f7b3e35.tar.gz build_soong-1b5599e462411b4f0d1f932865f302b74f7b3e35.tar.bz2 build_soong-1b5599e462411b4f0d1f932865f302b74f7b3e35.zip | |
Merge changes If1894fd9,Id7925999,I4fe11c3f,Iea2b0781,Id2c0a503
* changes:
Use PathForSource instead of PathsForSource
Move AllowMissingDependencies check from PathsForSource to PathForSource
Propagate errors out of validatePath
Add t.Run and t.Helper to paths_test.go
Remove unused intermediates parameter from ExistentPathForSource
Diffstat (limited to 'java')
| -rw-r--r-- | java/droiddoc.go | 8 | ||||
| -rw-r--r-- | java/java.go | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index efd430ad..ac6bd338 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -374,10 +374,8 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { } // templateDir (maybe missing) is relative to top of the source tree instead of current module. - templateDir := android.PathsForSource(ctx, []string{String(d.properties.Custom_template_dir)}) - if len(templateDir) > 0 { - implicits = append(implicits, ctx.GlobFiles(filepath.Join(templateDir[0].String(), "**/*"), nil)...) - } + templateDir := android.PathForSource(ctx, String(d.properties.Custom_template_dir)).String() + implicits = append(implicits, ctx.GlobFiles(filepath.Join(templateDir, "**/*"), nil)...) var htmlDirArgs string if len(d.properties.Html_dirs) > 0 { @@ -420,7 +418,7 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { opts := "-source 1.8 -J-Xmx1600m -J-XX:-OmitStackTraceInFastThrow -XDignore.symbol.file " + "-doclet com.google.doclava.Doclava -docletpath ${config.JsilverJar}:${config.DoclavaJar} " + - "-templatedir " + String(d.properties.Custom_template_dir) + " " + htmlDirArgs + " " + htmlDir2Args + " " + + "-templatedir " + templateDir + " " + htmlDirArgs + " " + htmlDir2Args + " " + "-hdf page.build " + ctx.Config().BuildId() + "-" + ctx.Config().BuildNumberFromFile() + " " + "-hdf page.now " + `"$$(date -d @$$(cat ` + ctx.Config().Getenv("BUILD_DATETIME_FILE") + `) "+%d %b %Y %k:%M")"` + " " + args + " -stubs " + android.PathForModuleOut(ctx, "docs", "stubsDir").String() diff --git a/java/java.go b/java/java.go index 4a7d7043..ae48bd65 100644 --- a/java/java.go +++ b/java/java.go @@ -371,8 +371,8 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep { jar = filepath.Join(dir, "core.jar") } aidl := filepath.Join(dir, "framework.aidl") - jarPath := android.ExistentPathForSource(ctx, "sdkdir", jar) - aidlPath := android.ExistentPathForSource(ctx, "sdkdir", aidl) + jarPath := android.ExistentPathForSource(ctx, jar) + aidlPath := android.ExistentPathForSource(ctx, aidl) if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() { return sdkDep{ @@ -530,7 +530,7 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt flags = append(flags, android.JoinWithPrefix(j.exportAidlIncludeDirs.Strings(), "-I")) flags = append(flags, android.JoinWithPrefix(aidlIncludes.Strings(), "-I")) flags = append(flags, "-I"+android.PathForModuleSrc(ctx).String()) - if src := android.ExistentPathForSource(ctx, "", ctx.ModuleDir(), "src"); src.Valid() { + if src := android.ExistentPathForSource(ctx, ctx.ModuleDir(), "src"); src.Valid() { flags = append(flags, "-I"+src.String()) } |