diff options
| author |  xingao <xingao@google.com> | 2018-06-29 07:35:32 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-29 07:36:50 -0700 |
| commit | 5dcf548da7326fdabbd9d758e6b6c21039c20e7b (patch) | |
| tree | e7243ea6db3ad6c114d85f6d52a235eae6e4ed98 | |
| parent | ecba1495767154f8ad74eac2ce565db1218992e5 (diff) | |
Enable android dependency checking in Bazel.
RELNOTES: None.
PiperOrigin-RevId: 202644613
| -rw-r--r-- | src/BUILD | 2 | ||||
| -rw-r--r-- | src/create_embedded_tools.py | 2 | ||||
| -rw-r--r-- | src/test/shell/bazel/testdata/embedded_tools_srcs_deps | 3 | ||||
| -rw-r--r-- | src/tools/singlejar/BUILD | 2 |
4 files changed, 5 insertions, 4 deletions
@@ -172,7 +172,7 @@ py_binary( "//src/java_tools/singlejar:SingleJar_deploy.jar", ], "//conditions:default": [ - "//src/tools/singlejar:singlejar", + "//src/tools/singlejar:singlejar_local", ], }) + ([":embedded_jdk"] if (suffix == "") else []), visibility = [ diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py index 2fb96f276a..8d882d092f 100644 --- a/src/create_embedded_tools.py +++ b/src/create_embedded_tools.py @@ -43,7 +43,7 @@ output_paths = [ ('*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'), diff --git a/src/test/shell/bazel/testdata/embedded_tools_srcs_deps b/src/test/shell/bazel/testdata/embedded_tools_srcs_deps index 10a614141b..312244cb81 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 diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD index 530c78a1a6..a855a22064 100644 --- a/src/tools/singlejar/BUILD +++ b/src/tools/singlejar/BUILD @@ -50,7 +50,6 @@ cc_binary( "//conditions:default": [], }), linkstatic = 1, - # TODO(b/68065069): use singlejar_local except in remote execution visibility = ["//visibility:public"], deps = [ "options", @@ -335,6 +334,7 @@ cc_library( hdrs = ["desugar_checking.h"], deps = [ ":combiners", + "//src/main/protobuf:desugar_deps_cc_proto", ], ) |