commit 5dcf548da7326fdabbd9d758e6b6c21039c20e7b
author xingao <xingao@google.com> Fri Jun 29 07:35:32 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Jun 29 07:36:50 2018 -0700
tree e7243ea6db3ad6c114d85f6d52a235eae6e4ed98
parent ecba1495767154f8ad74eac2ce565db1218992e5

Enable android dependency checking in Bazel.

RELNOTES: None.
PiperOrigin-RevId: 202644613

src/BUILD

diff --git a/src/BUILD b/src/BUILD
index 7062b4d..5c11f7e 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -172,7 +172,7 @@
             "//src/java_tools/singlejar:SingleJar_deploy.jar",
         ],
         "//conditions:default": [
-            "//src/tools/singlejar:singlejar",
+            "//src/tools/singlejar:singlejar_local",
         ],
     }) + ([":embedded_jdk"] if (suffix == "") else []),
     visibility = [

src/create_embedded_tools.py

diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index 2fb96f2..8d882d0 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -43,7 +43,7 @@
     ('*ExperimentalRunner_deploy.jar',
      lambda x: 'tools/jdk/ExperimentalTestRunner_deploy.jar'),
     ('*Runner_deploy.jar', lambda x: 'tools/jdk/TestRunner_deploy.jar'),
-    ('*singlejar', lambda x: 'tools/jdk/singlejar/singlejar'),
+    ('*singlejar_local', lambda x: 'tools/jdk/singlejar/singlejar'),
     ('src/tools/runfiles/runfiles.py', lambda x: 'tools/runfiles/runfiles.py'),
     ('*launcher.exe', lambda x: 'tools/launcher/launcher.exe'),
     ('*def_parser.exe', lambda x: 'tools/def_parser/def_parser.exe'),

src/test/shell/bazel/testdata/embedded_tools_srcs_deps

diff --git a/src/test/shell/bazel/testdata/embedded_tools_srcs_deps b/src/test/shell/bazel/testdata/embedded_tools_srcs_deps
index 10a6141..312244c 100644
--- a/src/test/shell/bazel/testdata/embedded_tools_srcs_deps
+++ b/src/test/shell/bazel/testdata/embedded_tools_srcs_deps
@@ -10,7 +10,7 @@
 //third_party/ijar:platform_utils
 //third_party/def_parser:def_parser
 //third_party/def_parser:def_parser_lib
-//src/tools/singlejar:singlejar
+//src/tools/singlejar:singlejar_local
 //src/tools/singlejar:output_jar
 //src/tools/singlejar:options
 //src/tools/singlejar:token_stream
@@ -18,6 +18,7 @@
 //src/tools/singlejar:combiners
 //src/tools/singlejar:diag
 //src/tools/singlejar:mapped_file
+//src/tools/singlejar:desugar_checking
 //third_party/zlib:zlib
 //src/tools/launcher:launcher
 //src/tools/launcher:python_launcher

src/tools/singlejar/BUILD

diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
index 530c78a..a855a220 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -50,7 +50,6 @@
         "//conditions:default": [],
     }),
     linkstatic = 1,
-    # TODO(b/68065069): use singlejar_local except in remote execution
     visibility = ["//visibility:public"],
     deps = [
         "options",
@@ -335,6 +334,7 @@
     hdrs = ["desugar_checking.h"],
     deps = [
         ":combiners",
+        "//src/main/protobuf:desugar_deps_cc_proto",
     ],
 )