clean up: ARCADIA_MAPKIT, USE_EXTERNAL_PROTOC
@@ -678,16 +678,7 @@ module _BASE_UNIT {
MACRO_ALIAS(PROTO_CMD _CPP_PROTO_EVLOG_CMD)
}
otherwise {
- when ($ARCADIA_MAPKIT) {
- PROTOC=$MAPKIT_SDK_RESOURCE_GLOBAL/mapkit_sdk/bin/protoc
- PROTOC_STYLEGUIDE_OUT=
- PROTOC_PLUGIN_STYLEGUIDE=
- PROTO_PATH=$MAPKIT_SDK_RESOURCE_GLOBAL/mapkit_sdk/include
- MACRO_ALIAS(PROTO_CMD _MAPKIT_CPP_PROTO_CMD)
- PROTO_SOURCE_INCLUDE=
- PROTO_HEADER_INCLUDE=
- }
- elsewhen ($USE_VANILLA_PROTOC) {
+ when ($USE_VANILLA_PROTOC) {
PROTOC=${tool:"contrib/tools/protoc_std"}
PROTOC_STYLEGUIDE_OUT=
PROTOC_PLUGIN_STYLEGUIDE=
@@ -698,15 +689,6 @@ module _BASE_UNIT {
CFLAGS+=-Wno-unused-parameter
}
- elsewhen ($USE_EXTERNAL_PROTOC) {
- PROTOC=$EXTERNAL_PROTOC_RESOURCE_GLOBAL/bin/protoc
- PROTOC_STYLEGUIDE_OUT=
- PROTOC_PLUGIN_STYLEGUIDE=
- PROTO_PATH=$EXTERNAL_PROTOC_RESOURCE_GLOBAL/include
- MACRO_ALIAS(PROTO_CMD _EXTERNAL_CPP_PROTO_CMD)
- PROTO_SOURCE_INCLUDE=
- PROTO_HEADER_INCLUDE=
- }
elsewhen ($QUASAR) {
MACRO_ALIAS(PROTO_CMD _QUASAR_CPP_PROTO_CMD)
}
@@ -719,11 +701,6 @@ module _BASE_UNIT {
FLATBUFFER_HEADER_INCLUDE=contrib/libs/flatbuffers/include/flatbuffers/flatbuffers.h
FLATBUFFER64_HEADER_INCLUDE=contrib/libs/flatbuffers64/include/flatbuffers/flatbuffers.h
- when ($ARCADIA_MAPKIT) {
- FLATBUFFER_HEADER_INCLUDE=
- FLATBUFFER64_HEADER_INCLUDE=
- }
-
SANITIZER_DEFINED=no
when ($SANITIZER_TYPE && $SANITIZER_TYPE != "no" && $SANITIZER_TYPE != "pg") {
@@ -6058,14 +6035,8 @@ OPENGL_VERSION=18.0.5
ANDROID_APK_TEST_ACTIVITY_VALUE=com.yandex.test.unittests/.RunTestsActivity
-USE_EXTERNAL_PROTOC=
-
# mapsmobi build configuration
-when ($MAPSMOBI_BUILD_TARGET) {
- USE_VANILLA_PROTOC=yes
-}
-
MAPSMOBI_IDL_TOOL=tools/idl/bin
MAPSMOBI_BUILD=
YANDEX_EXPORT=
@@ -6080,6 +6051,7 @@ when ($MAPSMOBI_BUILD) {
}
when ($MAPSMOBI_BUILD_TARGET) {
ALLOCATOR=FAKE
+ USE_VANILLA_PROTOC=yes
SYSINCL+=build/sysincl/mapsmobi.yml
OPTIMIZE=-O2
