diff options
| author |  Eric Gribkoff <ericgribkoff@google.com> | 2018-04-03 15:09:59 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-03 15:09:59 -0700 |
| commit | 5a03bdb62209ac81e813b1b5ff5ff4aafbca42f4 (patch) | |
| tree | fe43c98aabe104e8bbb6c7e741794067e0747f87 /examples | |
| parent | cb078e5558836e7e5fb6510a6f687e4e3eefa939 (diff) | |
| parent | 10ad26f91748b675c1f319c95e006f73ab64159a (diff) | |
Merge pull request #14885 from ericgribkoff/android_cleanup
simplify CMake build
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/android/helloworld/app/CMakeLists.txt | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/examples/android/helloworld/app/CMakeLists.txt b/examples/android/helloworld/app/CMakeLists.txt index ad6c1b834c..f449a5ce2e 100644 --- a/examples/android/helloworld/app/CMakeLists.txt +++ b/examples/android/helloworld/app/CMakeLists.txt @@ -12,40 +12,6 @@ file(MAKE_DIRECTORY ${GRPC_BUILD_DIR}) add_subdirectory(${GRPC_SRC_DIR} ${GRPC_BUILD_DIR}) -include_directories(${GRPC_SRC_DIR}/include) - -add_library(libgrpc STATIC IMPORTED) -set_target_properties(libgrpc PROPERTIES IMPORTED_LOCATION - ${GRPC_BUILD_DIR}/libgrpc.a) - -add_library(libgrpc++ STATIC IMPORTED) -set_target_properties(libgrpc++ PROPERTIES IMPORTED_LOCATION - ${GRPC_BUILD_DIR}/libgrpc++.a) - -add_library(libgpr STATIC IMPORTED) -set_target_properties(libgpr PROPERTIES IMPORTED_LOCATION - ${GRPC_BUILD_DIR}/libgpr.a) - -add_library(libaddress_sorting STATIC IMPORTED) -set_target_properties(libaddress_sorting PROPERTIES IMPORTED_LOCATION - ${GRPC_BUILD_DIR}/libaddress_sorting.a) - -add_library(libcares STATIC IMPORTED) -set_target_properties(libcares PROPERTIES IMPORTED_LOCATION - ${GRPC_BUILD_DIR}/third_party/cares/cares/lib/libcares.a) - -add_library(libzlib STATIC IMPORTED) -set_target_properties(libzlib PROPERTIES IMPORTED_LOCATION - ${GRPC_BUILD_DIR}/third_party/zlib/libz.a) - -add_library(libcrypto STATIC IMPORTED) -set_target_properties(libcrypto PROPERTIES IMPORTED_LOCATION - ${GRPC_BUILD_DIR}/third_party/boringssl/crypto/libcrypto.a) - -add_library(libssl STATIC IMPORTED) -set_target_properties(libssl PROPERTIES IMPORTED_LOCATION - ${GRPC_BUILD_DIR}/third_party/boringssl/ssl/libssl.a) - set(GRPC_PROTO_GENS_DIR ${CMAKE_BINARY_DIR}/gens) file(MAKE_DIRECTORY ${GRPC_PROTO_GENS_DIR}) include_directories(${GRPC_PROTO_GENS_DIR}) @@ -100,8 +66,8 @@ add_library(helloworld_proto_lib SHARED ${HELLOWORLD_PROTO_HDRS} ${HELLOWORLD_PROTO_SRCS}) target_link_libraries(helloworld_proto_lib + grpc++ libprotobuf - libgrpc++ android log) @@ -115,14 +81,6 @@ target_include_directories(grpc-helloworld PRIVATE ${HELLOWORLD_PROTO_HEADERS}) target_link_libraries(grpc-helloworld - libgrpc++ - libgrpc - libaddress_sorting - libzlib - libcares - libssl - libcrypto helloworld_proto_lib - libgpr android ${log-lib}) |