From d9cafb7ca2d9cc9250b2a6a8881a16581f217f59 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 14 Feb 2016 20:14:24 +0100
Subject: [PATCH] Buck: Fix java_doc rule to use $(classpath :foo) macro

java_doc rule was using $(location :foo) instead of $(classpath :foo)
macro. This is similar but not the same. The subtle difference is the
replacement that is done for java_library() when only exported deps are
used. While location macro doesn't work here, because there are no out
file associated with such a java_library, classpath macro correctly
resolves the dependencies.

Change-Id: Iab67dff9c332027765bc0da8c46810de11974de8
---
 gerrit-acceptance-framework/BUCK | 4 ++--
 tools/java_doc.defs              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gerrit-acceptance-framework/BUCK b/gerrit-acceptance-framework/BUCK
index 4e85d90329..2e4218e98e 100644
--- a/gerrit-acceptance-framework/BUCK
+++ b/gerrit-acceptance-framework/BUCK
@@ -85,8 +85,8 @@ java_doc(
     '//lib/guice:guice-servlet',
     '//lib/guice:javax-inject',
     '//lib:gwtorm_client',
-    '//lib:junit__jar',
-    '//lib:truth__jar',
+    '//lib:junit',
+    '//lib:truth',
   ],
   visibility = ['PUBLIC'],
 )
diff --git a/tools/java_doc.defs b/tools/java_doc.defs
index 514a730a85..65865bb4c4 100644
--- a/tools/java_doc.defs
+++ b/tools/java_doc.defs
@@ -29,7 +29,7 @@ def java_doc(
       '-sourcepath ',
       ':'.join(sourcepath),
       ' -classpath ',
-      ':'.join(['$(location %s)' % n for n in deps]),
+      ':'.join(['$(classpath %s)' % n for n in deps]),
       '-d $TMP',
     ]) + ';jar cf $OUT -C $TMP .',
     srcs = srcs,