commit d6314fc3e206f7993e57d0d87c6f65cc2e494360
author Goktug Gokdogan <goktug@google.com> Fri Oct 09 14:59:43 2015 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 10 02:07:14 2015 +0000
tree da751e1d860404280280b10c558577f685ca43cf
parent 66ce34a60edb16d30ed4cfe627d8f6e434f1c539

Sync back build files

Change-Id: I8440c4b8109b2a74bda2dd381d929d8b5468fe81

user/BUILD

diff --git a/user/BUILD b/user/BUILD
index d3ac5eb..f4fe504 100644
--- a/user/BUILD
+++ b/user/BUILD
@@ -138,18 +138,27 @@
            "$(location java/com/google/web/bindery/autobean/AutoBean.gwt.xml)"),
 )
 
+java_import(
+    name = "autobean_import",
+    constraints = [
+        "gwt",
+        "public",
+    ],
+    jars = [":autobean-classes-src.jar"],
+    deps = [
+        "//third_party/java_src/gwt:gwt-dev",
+        "//third_party/java_src/gwt:gwt-user-full",
+    ],
+)
+
 java_library(
     name = "autobean",
-    srcs = [":autobean-classes-src.jar"],
     constraints = [
         "gwt",
         "public",
     ],
     gwtxml = "java/com/google/web/bindery/autobean/AutoBean.gwt.xml",
-    deps = [
-        "//third_party/java_src/gwt:gwt-dev",
-        "//third_party/java_src/gwt:gwt-user-full",
-    ],
+    exports = [":autobean_import"],
 )
 
 # Packages just IncrementalBuilder test resource into a jar with correct java root.
@@ -209,9 +218,9 @@
 # this package are distributed in one form (through the class jars, as AugmentedJar does)
 # This prevents them appearing them on classpath as both sources and classes, which confuses javac
 # For example see b/3033925
-java_library(
+java_import(
     name = "gwt-servlet-internal",
-    srcs = [":libgwt-servlet-impl.jar"],
+    jars = [":libgwt-servlet-impl.jar"],
 )
 
 java_library(
@@ -405,17 +414,7 @@
     ],
     constraints = [
         "android",
-        "gwt",
-        "public",
     ],
-    gwtxml = "Gwt-jsinterop-annotations.gwt.xml",
-)
-
-# (This is a genrule so that it won't be mirrored to svn and git.)
-genrule(
-    name = "jsinterop-annotations-gwtxml",
-    outs = ["Gwt-jsinterop-annotations.gwt.xml"],
-    cmd = "$(ECHO) '<module><source path=\"client\" /></module>' > $(@)",
 )
 
 # Creates gwt-testing.jar, which contains GWTTestCase and its infrastructure.
@@ -469,11 +468,6 @@
     ],
     constraints = [
         "android",
-        "gwt",
-        "public",
-    ],
-    deps = [
-        "//third_party/java/jsr305_annotations",
     ],
 )