Use old protobuf only for py2 modules

9297b1e11cb82f887ab18e3c728f647d09ee885e

6 files changed, 1 insertions, 68 deletions

diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 92c31b0d9a..ebd1641b4a 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -1,6 +1,6 @@
 # tag:tool-specific tag:proto
 PROTOC=${tool:"contrib/tools/protoc"}
-when ($PYTHON2 == "yes") {
+when ($MODULE_LANG == "py2") {
     PROTOC=${tool:"contrib/tools/protoc_old"}
 }
 JAVA_PROTOC=${tool:"contrib/tools/protoc"}
diff --git a/contrib/tools/protoc_old/main.c b/contrib/tools/protoc_old/main.c
deleted file mode 100644
index e69de29bb2..0000000000
--- a/contrib/tools/protoc_old/main.c
+++ /dev/null
diff --git a/contrib/tools/protoc_old/resources.json b/contrib/tools/protoc_old/resources.json
deleted file mode 100644
index 78e8cf3696..0000000000
--- a/contrib/tools/protoc_old/resources.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "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
deleted file mode 100644
index 97296084ee..0000000000
--- a/contrib/tools/protoc_old/ya.make
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE(ya.make.prebuilt)
diff --git a/contrib/tools/protoc_old/ya.make.induced_deps b/contrib/tools/protoc_old/ya.make.induced_deps
deleted file mode 100644
index 55ede44772..0000000000
--- a/contrib/tools/protoc_old/ya.make.induced_deps
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index a0677fbf82..0000000000
--- a/contrib/tools/protoc_old/ya.make.prebuilt
+++ /dev/null
@@ -1,20 +0,0 @@
-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()