diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-07 20:19:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-07 20:19:41 +0000 |
| commit | 6956750dc55dd516c0e95bb50f865bfecee919a6 (patch) | |
| tree | 9d0c9dd59de3392718798c4f4e238a46ec159578 | |
| parent | f1947a171ce7354846a42513a19fb7a644705586 (diff) | |
| parent | f22c0edd930f86f79c31bf64a354524d64a67532 (diff) | |
| download | grpc-grpc-6956750dc55dd516c0e95bb50f865bfecee919a6.tar.gz | |
CMakeLists for Cross-compiling am: 7b021fb84b am: f22c0edd93
Change-Id: I4ba53d38a9735258865ffa5cccbae45b19d25ef3
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/core/lib/iomgr/unix_sockets_posix.cc | 1 |
2 files changed, 15 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 124bd0dc60..198af83a4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,13 +176,13 @@ function(protobuf_generate_grpc_cpp) "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h" - COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} + COMMAND ${gRPC_PROTOBUF_PROTOC_EXECUTABLE} ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} --cpp_out=${_gRPC_PROTO_GENS_DIR} - --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin> + --plugin=protoc-gen-grpc=${gRPC_CPP_PLUGIN} ${_protobuf_include_path} ${REL_FIL} - DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin + DEPENDS ${ABS_FIL} ${gRPC_PROTOBUF_PROTOC} ${gRPC_CPP_PLUGIN} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Running gRPC C++ protocol buffer compiler on ${FIL}" VERBATIM) @@ -191,6 +191,17 @@ function(protobuf_generate_grpc_cpp) endforeach() endfunction() +#if cross-compiling or nativesdk, find host plugin +if(CMAKE_CROSSCOMPILING) + find_program(gRPC_CPP_PLUGIN protoc-gen-grpc-cpp-plugin) # Android GRPC plugin + find_program(gRPC_PROTOBUF_PROTOC_EXECUTABLE aprotoc) # Android Protoc + set(gRPC_PROTOBUF_PROTOC ${gRPC_PROTOBUF_PROTOC_EXECUTABLE}) +else() + set(gRPC_CPP_PLUGIN $<TARGET_FILE:grpc_cpp_plugin>) + set(gRPC_PROTOBUF_PROTOC ${_gRPC_PROTOBUF_PROTOC}) + set(gRPC_PROTOBUF_PROTOC_EXECUTABLE ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}) +endif() + add_custom_target(plugins DEPENDS grpc_cpp_plugin diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc index 49ced557c3..cf93a7d9c4 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.cc +++ b/src/core/lib/iomgr/unix_sockets_posix.cc @@ -30,6 +30,7 @@ #include "src/core/lib/iomgr/sockaddr.h" +#include <cstdio> #include <string.h> #include <sys/stat.h> #include <sys/types.h> |