Fix build error on x86_64 architecture

Change-Id: Ie8fedf329ff6259a534130cd3cdf8c4945d44f3d
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45dbaae..5261262 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,10 +55,6 @@ IF("${ARCH}" MATCHES "^arm.*")
 SET(SRC_LIB_DIR "${CMAKE_SOURCE_DIR}/lib/armv7l")
 ELSEIF("${ARCH}" MATCHES "^aarch64.*")
 SET(SRC_LIB_DIR "${CMAKE_SOURCE_DIR}/lib/aarch64")
-ELSEIF("${ARCH}" MATCHES "^i586.*")
-SET(SRC_LIB_DIR "${CMAKE_SOURCE_DIR}/lib/i586")
-ELSEIF("${ARCH}" MATCHES "^i686.*")
-SET(SRC_LIB_DIR "${CMAKE_SOURCE_DIR}/lib/i586")
 ENDIF()
 
 SET(ISE_PACKAGE ${PROJECT_NAME})
@@ -149,14 +145,19 @@ ADD_DEFINITIONS("-DLAYOUTDIR=\"${ISE_LAYOUTDIR}\"")
 ADD_DEFINITIONS(-DISE_NAME=\"/ise-default\")
 ADD_DEFINITIONS(-DSUPPORTS_EMOTICONS)
 
+IF(("${ARCH}" MATCHES "^arm.*") OR ("${ARCH}" MATCHES "^aarch64.*"))
+ADD_DEFINITIONS("-DSUPPORT_NMT")
 LINK_DIRECTORIES(${SRC_LIB_DIR})
+ENDIF()
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${ISE_SRCS})
 
 ADD_EXECUTABLE(${PROJECT_NAME}-setting ${ISE_SETTING_SRCS})
 
+IF(("${ARCH}" MATCHES "^arm.*") OR ("${ARCH}" MATCHES "^aarch64.*"))
 INSTALL(FILES ${SRC_LIB_DIR}/libsamsung-ai-nmt.so DESTINATION ${ISE_LIBDIR})
 SET(ISE_PKGS_LDFLAGS -Llib -lsamsung-ai-nmt ${ISE_PKGS_LDFLAGS})
+ENDIF()
 
 # For edc File
 ADD_CUSTOM_TARGET(

diff --git a/lib/i586/libsamsung-ai-nmt.so b/lib/i586/libsamsung-ai-nmt.so
deleted file mode 100755 (executable)
index 04398db..0000000
Binary files a/lib/i586/libsamsung-ai-nmt.so and /dev/null differ

diff --git a/packaging/ise-default.spec b/packaging/ise-default.spec
index aad29f4..1ea7f89 100644 (file)
--- a/packaging/ise-default.spec
+++ b/packaging/ise-default.spec
@@ -365,7 +365,9 @@ popd
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_PACKAGES}/%{name}.xml
+%ifarch %{arm} aarch64
 %{TZ_SYS_RO_APP}/ise-default/lib/*
+%endif
 %license LICENSE
 
 # This is for old profile-based OBS project optimizations.

diff --git a/src/nmt.cpp b/src/nmt.cpp
index ea25266..654ca2f 100644 (file)
--- a/src/nmt.cpp
+++ b/src/nmt.cpp
@@ -27,6 +27,7 @@
 #undef LOG_TAG
 #define LOG_TAG "ISE_DEFAULT"
 
+#ifdef SUPPORT_NMT
 static samsung_ai_nmt_h g_nmt_h;
 static bool g_selected_text_exist = false;
 
@@ -95,9 +96,11 @@ static void _nmt_translate_result_cb(samsung_ai_nmt_h nmt_h, unsigned int reques
         translated_text = NULL;
     }
 }
+#endif
 
 bool nmt_init()
 {
+#ifdef SUPPORT_NMT
     int ret = samsung_ai_nmt_create(&g_nmt_h, _nmt_connection_status_changed_cb, NULL);
     if (ret != SAMSUNG_AI_NMT_ERROR_NONE) {
         LOGE("Failed to initialize");
@@ -111,10 +114,14 @@ bool nmt_init()
     }
 
     return true;
+#else
+    return false;
+#endif
 }
 
 void nmt_shutdown()
 {
+#ifdef SUPPORT_NMT
     int ret = IME_ERROR_NONE;
     if (g_nmt_h) {
         ret = samsung_ai_nmt_destroy(g_nmt_h);
@@ -124,10 +131,12 @@ void nmt_shutdown()
 
         g_nmt_h = NULL;
     }
+#endif
 }
 
 void nmt_translate(const char *source_language, const char *target_language)
 {
+#ifdef SUPPORT_NMT
     int ret = IME_ERROR_NONE;
     char *text = NULL;
     unsigned int request_id = 0;
@@ -165,4 +174,5 @@ void nmt_translate(const char *source_language, const char *target_language)
         free(text);
 
     text = NULL;
+#endif
 }