commit 1b9e4b191cb1c6b3fca40df33ad3e63ce7c354f4
author David Ostrovsky <david.ostrovsky@gmail.com> Mon Oct 24 20:41:22 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 24 20:41:22 2016 +0000
tree 5f8a2f26835942483e5b87115bc841f8b54ffc6e
parent 4c86cefaccd7d79416c35c233f98e5713f020910
parent 0e121132f51c25acba760509404f8dfe00b98314

Merge "Bazel: Simplify diffy_logo rules"

gerrit-gwtui-common/BUILD

diff --git a/gerrit-gwtui-common/BUILD b/gerrit-gwtui-common/BUILD
index 4bd2dfd..c13dbd2 100644
--- a/gerrit-gwtui-common/BUILD
+++ b/gerrit-gwtui-common/BUILD
@@ -13,7 +13,6 @@
 ]
 DEPS = ['//lib/gwt:user']
 SRC = 'src/main/java/com/google/gerrit/'
-DIFFY = glob(['src/main/resources/com/google/gerrit/client/diffy*.png'])
 
 gwt_module(
   name = 'client',
@@ -38,26 +37,14 @@
   visibility = ['//visibility:public'],
 )
 
-java_import(
+java_library(
   name = 'diffy_logo',
-  jars = [':diffy_image_files_ln'],
-  visibility = ['//visibility:public'],
+  resources = glob(['src/main/resources/com/google/gerrit/client/diffy*.png']),
   data = [
     '//lib:LICENSE-diffy',
     '//lib:LICENSE-CC-BY3.0-unported',
   ],
-)
-
-genrule2(
-  name = 'diffy_image_files_ln',
-  srcs = [':diffy_image_files'],
-  cmd = 'ln -s $$ROOT/$(location :diffy_image_files) $@',
-  out = 'diffy_images.jar',
-)
-
-java_library(
-  name = 'diffy_image_files',
-  resources = DIFFY,
+  visibility = ['//visibility:public'],
 )
 
 junit_tests(