From 0497b39d4ca4716531a8a162b4f905e6538f131d Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 12 Apr 2019 14:48:17 -0700 Subject: [PATCH] Fix eclipse classpath generation //proto/testing:test_java_proto dependency has to be built for the eclipse classpath generation to work properly. Test Plan: 1. Make sure the final artifact is removed (or not built): $ rm bazel-out/darwin-fastbuild/bin/proto/testing/libtest_proto-speed.jar 2. Generate eclipse classpath: $ ./tools/eclipse/project.py 3. Confirm that the generated artifact is created as expected: $ ls bazel-out/darwin-fastbuild/bin/proto/testing/libtest_proto-speed.jar Change-Id: I19562383d99728030a2205aff9a31060409b2860 --- tools/eclipse/BUILD | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD index 6b475d8ba8..5ef3a4618b 100644 --- a/tools/eclipse/BUILD +++ b/tools/eclipse/BUILD @@ -10,6 +10,9 @@ load( TEST_DEPS = [ "//javatests/com/google/gerrit/elasticsearch:elasticsearch_test_utils", "//javatests/com/google/gerrit/server:server_tests", +] + +TEST_DEPS_GENERATED = [ "//proto/testing:test_java_proto", ] @@ -27,13 +30,13 @@ DEPS = [ java_library( name = "classpath", testonly = True, - runtime_deps = LIBS + PGMLIBS + DEPS, + runtime_deps = LIBS + PGMLIBS + DEPS + TEST_DEPS_GENERATED, ) classpath_collector( name = "main_classpath_collect", testonly = True, - deps = LIBS + PGMLIBS + DEPS + TEST_DEPS + + deps = LIBS + PGMLIBS + DEPS + TEST_DEPS + TEST_DEPS_GENERATED + ["//plugins/%s:%s__plugin" % (n, n) for n in CORE_PLUGINS + CUSTOM_PLUGINS] + ["//plugins/%s:%s__plugin_test_deps" % (n, n) for n in CUSTOM_PLUGINS_TEST_DEPS], )