From ffa10caf94ce59e4f47c6ab1f136b8d7a7d4e081 Mon Sep 17 00:00:00 2001
From: Eric Gribkoff <ericgribkoff@google.com>
Date: Fri, 30 Mar 2018 11:08:12 -0700
Subject: simplify CMake build

---
 examples/android/helloworld/app/CMakeLists.txt | 46 ++------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

(limited to 'examples/android')

diff --git a/examples/android/helloworld/app/CMakeLists.txt b/examples/android/helloworld/app/CMakeLists.txt
index ad6c1b834c..40ae7fc980 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
-  libprotobuf
-  libgrpc++
+  grpc++
+  ${_gRPC_PROTOBUF_LIBRARIES}
   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})
-- 
cgit v1.2.3