wip

1dd96051780874258d4894fb930966919335a2d6

8 files changed, 70 insertions, 22 deletions

diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 1028a8c79a..4416f5ec57 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -1,5 +1,8 @@
 # tag:tool-specific tag:proto
 PROTOC=${tool:"contrib/tools/protoc"}
+when ($PYTHON2) {
+    PROTOC=${tool:"contrib/tools/protoc_old"}
+}
 JAVA_PROTOC=${tool:"contrib/tools/protoc"}
 NEW_JAVA_PROTOC=yes
 when ($NEW_JAVA_PROTOC == "yes") {
diff --git a/contrib/tools/protoc/plugins/ya.make b/contrib/tools/protoc/plugins/ya.make
deleted file mode 100644
index 44254ae111..0000000000
--- a/contrib/tools/protoc/plugins/ya.make
+++ /dev/null
@@ -1,6 +0,0 @@
-RECURSE(
-    cpp_styleguide
-    grpc_cpp
-    grpc_java
-    grpc_python
-)
diff --git a/contrib/tools/protoc/ya.make b/contrib/tools/protoc/ya.make
deleted file mode 100644
index 59b96b2a63..0000000000
--- a/contrib/tools/protoc/ya.make
+++ /dev/null
@@ -1,16 +0,0 @@
-# WARN:
-#   The Piglet sync service (abc:cc-piglet) relies on prebuiltness of protoc.
-#   DO NOT REMOVE ya.make.prebuilt.
-
-IF (USE_PREBUILT_TOOLS)
-    INCLUDE(ya.make.prebuilt)
-ENDIF()
-
-IF (NOT PREBUILT)
-    INCLUDE(bin/ya.make)
-ENDIF()
-
-RECURSE(
-    bin
-    plugins
-)
diff --git a/contrib/tools/protoc_old/main.c b/contrib/tools/protoc_old/main.c
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/contrib/tools/protoc_old/main.c
diff --git a/contrib/tools/protoc_old/resources.json b/contrib/tools/protoc_old/resources.json
new file mode 100644
index 0000000000..78e8cf3696
--- /dev/null
+++ b/contrib/tools/protoc_old/resources.json
@@ -0,0 +1,16 @@
+{
+    "by_platform": {
+        "darwin": {
+            "uri": "sbr:5841615385"
+        },
+        "darwin-arm64": {
+            "uri": "sbr:5841614302"
+        },
+        "linux": {
+            "uri": "sbr:5841616607"
+        },
+        "win32": {
+            "uri": "sbr:5841613390"
+        }
+    }
+}
diff --git a/contrib/tools/protoc_old/ya.make b/contrib/tools/protoc_old/ya.make
new file mode 100644
index 0000000000..97296084ee
--- /dev/null
+++ b/contrib/tools/protoc_old/ya.make
@@ -0,0 +1 @@
+INCLUDE(ya.make.prebuilt)
diff --git a/contrib/tools/protoc_old/ya.make.induced_deps b/contrib/tools/protoc_old/ya.make.induced_deps
new file mode 100644
index 0000000000..55ede44772
--- /dev/null
+++ b/contrib/tools/protoc_old/ya.make.induced_deps
@@ -0,0 +1,30 @@
+INDUCED_DEPS(cpp
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/descriptor.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_reflection.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/io/coded_stream.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/reflection_ops.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/common.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/once.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/port.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/wire_format.h
+)
+INDUCED_DEPS(h+cpp
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/arena.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/arenastring.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/extension_set.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_enum_reflection.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_bases.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_table_driven.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_util.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/io/coded_stream.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/map.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/map_entry.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/map_field_inl.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/message.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/metadata_lite.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/port_def.inc
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/port_undef.inc
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/repeated_field.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/common.h
+    ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/unknown_field_set.h
+)
diff --git a/contrib/tools/protoc_old/ya.make.prebuilt b/contrib/tools/protoc_old/ya.make.prebuilt
new file mode 100644
index 0000000000..a0677fbf82
--- /dev/null
+++ b/contrib/tools/protoc_old/ya.make.prebuilt
@@ -0,0 +1,20 @@
+SET_RESOURCE_URI_FROM_JSON(SANDBOX_RESOURCE_URI resources.json)
+
+IF (SANDBOX_RESOURCE_URI != "")
+    ENABLE(PREBUILT)
+
+    PREBUILT_PROGRAM()
+
+    DECLARE_EXTERNAL_RESOURCE(PROTOC ${SANDBOX_RESOURCE_URI})
+
+    PRIMARY_OUTPUT(${PROTOC_RESOURCE_GLOBAL}/protoc${MODULE_SUFFIX})
+
+    INCLUDE(ya.make.induced_deps)
+
+    END()
+ELSE()
+    PROGRAM(protoc)
+    SRCS(main.c)
+    INCLUDE(ya.make.induced_deps)
+    END()
+ENDIF()