From 0c25f8c4f69ed4d375937af2a5b2ca1751154397 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 30 Jul 2017 12:08:04 +0200 Subject: [PATCH] Bazel: Move PLUGIN_DEPS_NEVERLINK declaration to plugin.bzl PLUGIN_DEPS is already correctly defined in plugin.bzl, but the corresponding neverlik constant PLUGIN_DEPS_NEVERLINK is erroneously defined in gwt.bzl. This is a preparation change for removing of GWT UI, and removing of gwt.bzl. Change-Id: I2bd96c7217554afe5835e031f939660a365f43ac --- tools/bzl/gwt.bzl | 4 ---- tools/bzl/plugin.bzl | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/bzl/gwt.bzl b/tools/bzl/gwt.bzl index deeb5d58dd..ef182bfe2a 100644 --- a/tools/bzl/gwt.bzl +++ b/tools/bzl/gwt.bzl @@ -52,10 +52,6 @@ GWT_COMPILER_ARGS_RELEASE_MODE = GWT_COMPILER_ARGS + [ "-XdisableCastChecking", ] -PLUGIN_DEPS_NEVERLINK = [ - "//gerrit-plugin-api:lib-neverlink", -] - GWT_PLUGIN_DEPS_NEVERLINK = [ "//gerrit-plugin-gwtui:gwtui-api-lib-neverlink", "//lib/gwt:user-neverlink", diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl index 59e7335e59..11ac5722bc 100644 --- a/tools/bzl/plugin.bzl +++ b/tools/bzl/plugin.bzl @@ -5,12 +5,12 @@ load( "GWT_PLUGIN_DEPS_NEVERLINK", "GWT_TRANSITIVE_DEPS", "GWT_COMPILER_ARGS", - "PLUGIN_DEPS_NEVERLINK", "GWT_JVM_ARGS", "gwt_binary", ) PLUGIN_DEPS = ["//gerrit-plugin-api:lib"] +PLUGIN_DEPS_NEVERLINK = ["//gerrit-plugin-api:lib-neverlink"] PLUGIN_TEST_DEPS = [ "//gerrit-acceptance-framework:lib",