Revise TCP build

diff --git a/android/aitt/src/main/java/com/samsung/android/aitt/Aitt.java b/android/aitt/src/main/java/com/samsung/android/aitt/Aitt.java
index 6fca796..71c8e6a 100644 (file)
--- a/android/aitt/src/main/java/com/samsung/android/aitt/Aitt.java
+++ b/android/aitt/src/main/java/com/samsung/android/aitt/Aitt.java
@@ -67,12 +67,11 @@ public class Aitt {
      * List of protocols supported by AITT framework
      */
     public enum Protocol {
-        MQTT(0x1 << 0),    // Publish message through the MQTT
-        TCP(0x1 << 1),     // Publish message to peers using the TCP
-        UDP(0x1 << 2),     // Publish message to peers using the UDP
-        SRTP(0x1 << 3),    // Publish message to peers using the SRTP
-        WEBRTC(0x1 << 4),  // Publish message to peers using the WEBRTC
-        IPC(0x1 << 5);     // Publish message to peers using the IPC
+        MQTT(0x1 << 0),           // Publish message through the MQTT
+        TCP(0x1 << 1),            // Publish message to peers using the TCP
+        TCP_SECURE(0x1 << 2),     // Publish message to peers using the Secure TCP
+        WEBRTC(0x1 << 3),         // Publish message to peers using the WEBRTC
+        IPC(0x1 << 4);            // Publish message to peers using the IPC
 
         private final int value;
 

diff --git a/android/aitt/src/test/java/com/samsung/android/aitt/AittUnitTest.java b/android/aitt/src/test/java/com/samsung/android/aitt/AittUnitTest.java
index 00958a4..4313628 100644 (file)
--- a/android/aitt/src/test/java/com/samsung/android/aitt/AittUnitTest.java
+++ b/android/aitt/src/test/java/com/samsung/android/aitt/AittUnitTest.java
@@ -494,7 +494,7 @@ public class AittUnitTest {
                             byte[] payload = message.getPayload();
                         }
                     },
-                    Aitt.Protocol.UDP, Aitt.QoS.AT_MOST_ONCE);
+                    Aitt.Protocol.TCP, Aitt.QoS.AT_MOST_ONCE);
 
             aitt.disconnect();
         } catch (Exception e) {

diff --git a/modules/tcp/CMakeLists.txt b/modules/tcp/CMakeLists.txt
index 96bd2d7..eff46e3 100644 (file)
--- a/modules/tcp/CMakeLists.txt
+++ b/modules/tcp/CMakeLists.txt
@@ -3,26 +3,25 @@ SET(AITT_SECURE_TCP aitt-transport-tcp-secure)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-IF(PLATFORM STREQUAL "tizen")
-    SET(OPENSSL openssl1.1)
-ELSE(PLATFORM STREQUAL "tizen")
-    SET(OPENSSL openssl)
-ENDIF(PLATFORM STREQUAL "tizen")
-
-PKG_CHECK_MODULES(AITT_TCP_NEEDS REQUIRED ${OPENSSL})
-INCLUDE_DIRECTORIES(${AITT_TCP_NEEDS_INCLUDE_DIRS})
-LINK_DIRECTORIES(${AITT_TCP_NEEDS_LIBRARY_DIRS})
-
 ADD_LIBRARY(TCP_OBJ STATIC TCP.cc TCPServer.cc AESEncryptor.cc)
-ADD_LIBRARY(${AITT_TCP} SHARED ../transport_entry.cc Module.cc)
-TARGET_LINK_LIBRARIES(${AITT_TCP} Threads::Threads TCP_OBJ ${AITT_COMMON} ${AITT_TCP_NEEDS_LIBRARIES})
 
 IF(PLATFORM STREQUAL "android")
     FIND_PACKAGE(openssl REQUIRED CONFIG)
     TARGET_LINK_LIBRARIES(TCP_OBJ openssl::crypto)
-    TARGET_LINK_LIBRARIES(${AITT_TCP} openssl::crypto)
+ELSE(PLATFORM STREQUAL "android")
+    IF(PLATFORM STREQUAL "tizen")
+        SET(OPENSSL openssl1.1)
+    ELSE(PLATFORM STREQUAL "tizen")
+        SET(OPENSSL openssl)
+    ENDIF(PLATFORM STREQUAL "tizen")
+    PKG_CHECK_MODULES(AITT_TCP_NEEDS REQUIRED ${OPENSSL})
+    INCLUDE_DIRECTORIES(${AITT_TCP_NEEDS_INCLUDE_DIRS})
+    LINK_DIRECTORIES(${AITT_TCP_NEEDS_LIBRARY_DIRS})
 ENDIF(PLATFORM STREQUAL "android")
 
+ADD_LIBRARY(${AITT_TCP} SHARED ../transport_entry.cc Module.cc)
+TARGET_LINK_LIBRARIES(${AITT_TCP} Threads::Threads TCP_OBJ ${AITT_COMMON} ${AITT_TCP_NEEDS_LIBRARIES})
+
 INSTALL(TARGETS ${AITT_TCP} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 IF(BUILD_TESTING)