Merge branch 'stable-2.14'

* stable-2.14:
  Consider plugin's test deps in eclipse classpath generation

Change-Id: I0c19e013f28c1100d341b13e2a6a22484d8f6dea
This commit is contained in:
David Pursehouse 2017-05-31 15:57:53 +09:00
commit a48bfb56da
2 changed files with 7 additions and 1 deletions

View File

@ -10,3 +10,7 @@ CORE_PLUGINS = [
CUSTOM_PLUGINS = [
# Add custom core plugins here
]
CUSTOM_PLUGINS_TEST_DEPS = [
# Add custom core plugins with tests deps here
]

View File

@ -4,6 +4,7 @@ load(
"//tools/bzl:plugins.bzl",
"CORE_PLUGINS",
"CUSTOM_PLUGINS",
"CUSTOM_PLUGINS_TEST_DEPS",
)
TEST_DEPS = [
@ -49,7 +50,8 @@ classpath_collector(
name = "main_classpath_collect",
testonly = 1,
deps = LIBS + PGMLIBS + DEPS + TEST_DEPS +
["//plugins/%s:%s__plugin" % (n, n) for n in CORE_PLUGINS + CUSTOM_PLUGINS],
["//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],
)
classpath_collector(