From f99f2febda81ddf9709ec59df532c383077a162c Mon Sep 17 00:00:00 2001 From: Rafi Kamal Date: Wed, 13 Nov 2019 16:19:46 -0800 Subject: [PATCH 1/2] Add a proto_lang_toolchain for javalite --- BUILD | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/BUILD b/BUILD index 07e8317d6f8c..c2e2cad5b063 100644 --- a/BUILD +++ b/BUILD @@ -1002,6 +1002,13 @@ proto_lang_toolchain( visibility = ["//visibility:public"], ) +proto_lang_toolchain( + name = "javalite_toolchain", + command_line = "--java_out=lite:$(OUT)", + runtime = ":protobuf_java_lite", + visibility = ["//visibility:public"], +) + alias( name = "objectivec", actual = ":protobuf_objc", From 5c2d9f97ac5c96ab0a43a51d70e80eb65c799a15 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Wed, 27 Nov 2019 09:22:30 -0800 Subject: [PATCH 2/2] fix toolchain. Swap javalite example to master repo --- BUILD | 2 +- examples/WORKSPACE | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/BUILD b/BUILD index 262b15bc7fe8..1c5236d9d8c7 100644 --- a/BUILD +++ b/BUILD @@ -1004,7 +1004,7 @@ proto_lang_toolchain( proto_lang_toolchain( name = "javalite_toolchain", command_line = "--java_out=lite:$(OUT)", - runtime = ":protobuf_java_lite", + runtime = ":protobuf_javalite", visibility = ["//visibility:public"], ) diff --git a/examples/WORKSPACE b/examples/WORKSPACE index db86225bc4d2..fccda3b30331 100644 --- a/examples/WORKSPACE +++ b/examples/WORKSPACE @@ -21,10 +21,9 @@ local_repository( # Similar to com_google_protobuf but for Java lite. If you are building # for Android, the lite version should be prefered because it has a much # smaller code size. -http_archive( +local_repository( name = "com_google_protobuf_javalite", - strip_prefix = "protobuf-javalite", - urls = ["https://github.com/protocolbuffers/protobuf/archive/javalite.zip"], + path = "..", ) load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")