From: Kiseok Chang <kiso.chang@samsung.com>
Date: Tue, 22 Dec 2020 09:35:47 +0000 (+0900)
Subject: Merge branch 'search' of ssh://review.tizen.org:29418/profile/common/apps/native... 
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fsearch;p=profile%2Fcommon%2Fapps%2Fnative%2Fsettings.git

Merge branch 'search' of ssh://review.tizen.org:29418/profile/common/apps/native/settings into search

Change-Id: I7e5e68e2eddce0c9bcd6cef2598e77ec5f04fe87
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>
---

5d399831b7e53d267e026d58e5ec88bbc2e6ab1b
diff --cc setting-search/CMakeLists.txt
index 3f302da,8b0d443..504baa6
--- a/setting-search/CMakeLists.txt
+++ b/setting-search/CMakeLists.txt
@@@ -19,7 -19,6 +19,10 @@@ pkg_check_modules(pkgs_search REQUIRE
  	pkgmgr
  	pkgmgr-info
  	capi-appfw-package-manager
++<<<<<<< HEAD
 +	capi-ui-sticker-consumer
++=======
++>>>>>>> bfdddd21bf333ac6a454f79fd264af137c690d70
  )
  
  FOREACH(flag ${pkgs_search_CFLAGS})
@@@ -47,7 -46,7 +50,11 @@@ ADD_EXECUTABLE(${PROJECT_SETTING_SEARCH
  	./src/setting-search-util.c
  	)
  
++<<<<<<< HEAD
 +TARGET_LINK_LIBRARIES(${PROJECT_SETTING_SEARCH} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON}  -lsetting-common)
++=======
+ TARGET_LINK_LIBRARIES(${PROJECT_SETTING_SEARCH} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
++>>>>>>> bfdddd21bf333ac6a454f79fd264af137c690d70
  TARGET_LINK_LIBRARIES(${PROJECT_SETTING_SEARCH} ${pkgs_search_LDFLAGS} -pie)
  
  INSTALL(PROGRAMS ${PROJECT_SETTING_SEARCH} DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_NAME}/bin)
diff --cc setting-search/src/setting-search-util.c
index 97c4753,f5da53b..fba2e40
--- a/setting-search/src/setting-search-util.c
+++ b/setting-search/src/setting-search-util.c
@@@ -580,7 -362,6 +580,10 @@@ static search_result_t **_search_db(reg
  
  search_result_t **setting_search(const char *search, int *found_size)
  {
++<<<<<<< HEAD
 +
++=======
++>>>>>>> bfdddd21bf333ac6a454f79fd264af137c690d70
  	regex_t regex;
  	int res;
  	res = regcomp(&regex, search, REG_NOSUB);