fix use of protoc for mobile mapkit; add MAPKIT_IDL_INCLUDES helper macro
@@ -150,7 +150,8 @@ XSUBPPFLAGS=
ARCH_TOOL=${tool:"tools/archiver"}
PROTOC=${tool:"contrib/tools/protoc"}
-PROTOC_STYLEGUIDE=${tool:"contrib/tools/protoc/plugins/cpp_styleguide"}
+PROTOC_STYLEGUIDE_OUT=--cpp_styleguide_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE
+PROTOC_PLUGIN_STYLEGUIDE=--plugin=protoc-gen-cpp_styleguide=${tool:"contrib/tools/protoc/plugins/cpp_styleguide"}
FML_TOOL=${tool:"tools/relev_fml_codegen"}
FML_UNUSED_TOOL=${tool:"tools/relev_fml_unused"}
LUA_TOOL=${tool:"tools/lua"}
@@ -349,7 +350,7 @@ module BASE_UNIT {
PROTO_HEADER_INCLUDE=contrib/libs/protobuf/stubs/once.h contrib/libs/protobuf/io/coded_stream.h contrib/libs/protobuf/wire_format_lite_inl.h contrib/libs/protobuf/descriptor.h contrib/libs/protobuf/reflection_ops.h contrib/libs/protobuf/wire_format.h
PROTO_HEADER_EXTS=.pb.h
- CPP_PROTO_CMDLINE=${cwd;rootdir;input:File} $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE -I=$ARCADIA_BUILD_ROOT -I=$PROTO_PATH --cpp_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE --cpp_styleguide_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE --plugin=protoc-gen-cpp_styleguide=$PROTOC_STYLEGUIDE ${input;rootrel:File}
+ CPP_PROTO_CMDLINE=${cwd;rootdir;input:File} $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE -I=$ARCADIA_BUILD_ROOT -I=$PROTO_PATH --cpp_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE $PROTOC_STYLEGUIDE_OUT $PROTOC_PLUGIN_STYLEGUIDE ${input;rootrel:File}
CPP_EV_OPTS=--plugin=protoc-gen-event2cpp=${tool:"tools/event2cpp"} --event2cpp_out=$ARCADIA_BUILD_ROOT -I=$ARCADIA_ROOT/library/eventlog
when ($GRPC_FLAG == "yes") {
@@ -390,6 +391,8 @@ module BASE_UNIT {
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=
@@ -2919,3 +2922,12 @@ macro RUN_PYTHON(Args...) {
SETUP_RUN_PYTHON()
RUN(${PYTHON_BIN} $Args)
}
+
+MAPKIT_IDL_INCLUDES=
+macro MAPKIT_ADDINCL(Dirs...) {
+ ADDINCL($Dirs)
+ SET_APPEND(MAPKIT_IDL_INCLUDES $Dirs)
+}
+
+ANDROID_SDK_ROOT=${ANDROID_SDK_RESOURCE_GLOBAL}/android_sdk
+
