summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2020-06-23 21:44:42 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-06-23 21:44:42 +0000
commit28d654952998aab41359980562ff2673fa2bc63e (patch)
tree5b0842d42a6e31ec949a25977f6f4f2c1e0b48b5 /java
parente176b5b92e6472230736740e1fcb798824848335 (diff)
parentc31efeb25cac61fd3c2af3fed5bedeca2d401994 (diff)
Merge "Set root dir in lint project.xml"
Diffstat (limited to 'java')
-rw-r--r--java/lint.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/java/lint.go b/java/lint.go
index ca87dbab6..b73d6a51a 100644
--- a/java/lint.go
+++ b/java/lint.go
@@ -155,8 +155,11 @@ func (l *linter) writeLintProjectXML(ctx android.ModuleContext,
cmd.FlagForEachArg("--extra_checks_jar ", l.extraLintCheckJars.Strings())
deps = append(deps, l.extraLintCheckJars...)
- // The cache tag in project.xml is relative to the project.xml file.
- cmd.FlagWithArg("--cache_dir ", "cache")
+ cmd.FlagWithArg("--root_dir ", "$PWD")
+
+ // The cache tag in project.xml is relative to the root dir, or the project.xml file if
+ // the root dir is not set.
+ cmd.FlagWithArg("--cache_dir ", cacheDir.String())
cmd.FlagWithInput("@",
android.PathForSource(ctx, "build/soong/java/lint_defaults.txt"))