commit 9d527eba8de546563f7d0fc033b510e4bea6c370
author Matthew Dempsky <mdempsky@google.com> Tue Aug 20 11:52:58 2013 -0700
committer Matthew Dempsky <mdempsky@google.com> Tue Aug 20 11:53:52 2013 -0700
tree b433fb082ea8d6c5e3e137c8b8383884874d7120
parent 3c317953e09ffc49b59b3cbdbe5f257cd425a444

Sync with internal changes.

Change-Id: I4db1e38597dcd76acefe89e2eb28cc5bae16178e

dev/BUILD

diff --git a/dev/BUILD b/dev/BUILD
index 0ca17f3..4df9de8 100644
--- a/dev/BUILD
+++ b/dev/BUILD
@@ -137,6 +137,11 @@
         ["core/src/**/*.java"],
         exclude = ["**/package-info.java"],
     ),
+    # Temporary workaround to ensure Java 6 compatible class files after Java
+    # 7 upgrade.
+    # TODO: only the requestfactory client should be required to be Android
+    # compatible.
+    constraints = ["android"],
     deps = [
         ":compiler.standalone.super",
         "//third_party/java_src/gwt/svn/tools:dev_deps",
@@ -215,6 +220,7 @@
             "**/package-info.java",
         ],
     ),
+    constraints = ["android"],
     javacopts = [
         "-encoding utf8",
         "-source 5",

dev/codeserver/BUILD

diff --git a/dev/codeserver/BUILD b/dev/codeserver/BUILD
index 4bd0713..57654d0 100644
--- a/dev/codeserver/BUILD
+++ b/dev/codeserver/BUILD
@@ -45,6 +45,7 @@
         # approved dependencies (for open source code)
         "//third_party/java_src/gwt:gwt-dev",
         # no other dependencies allowed
+        "//third_party/java/json",  # undeclared dependency of SourceMapConsumer. TODO: fix
     ],
 )