Merge branch 'tizen' into tizen_4.0submit/tizen_4.0/20171102.101350submit/tizen_4.0/20171102.082244submit/tizen_4.0/20171102.082126accepted/tizen/4.0/unified/20171103.030250

Change-Id: Idbdf974a747664573889fc1a32e5026a9c2e4564
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>

1 files changed, 2 insertions, 45 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 992c58a..a18208b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,44 +10,12 @@ SET(VERSION 0.1)
 
 SET(SRCS_RESET_CCMODE src/resetCCMode.c)
 SET(SRCS_RSTSMACK src/rstsmack.c)
-SET(SRCS_UTIL src/factory-reset-util.c)
 SET(SRCS src/factory-reset.c)
-SET(EDJ_SRCS ${CMAKE_SOURCE_DIR}/data/factory-reset-util.edc)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
-#IF("$ENV{CFLAGS}" MATCHES "-DTELEPHONY_DISABLE")
-#	MESSAGE("add -DTELEPHONY_DISABLE")
-#ELSE()
-#	SET(PKG_MODULES ${PKG_MODULES}
-#		tapi modem
-#	)
-#ENDIF()
-
-#IF("$ENV{CFLAGS}" MATCHES "-DCSC_DISABLE")
-#	MESSAGE("add -DCSC_DISABLE")
-#ELSE()
-#	SET(PKG_MODULES ${PKG_MODULES}
-#		csc-manager
-#	)
-#ENDIF()
-
-IF("${DISPLAY_RESOLUTION}" STREQUAL "320x320")
-	MESSAGE("font size is 22")
-	ADD_DEFINITIONS("-DFACTORY_RESET_FONT_SIZE=22")
-	SET(EDJ_SRCS ${CMAKE_SOURCE_DIR}/data/factory-reset-util-small-display.edc)
-ELSEIF("${DISPLAY_RESOLUTION}" STREQUAL "360x480")
-	MESSAGE("font size is 24")
-	ADD_DEFINITIONS("-DFACTORY_RESET_FONT_SIZE=24")
-	SET(EDJ_SRCS ${CMAKE_SOURCE_DIR}/data/factory-reset-util-small-display.edc)
-ELSEIF("${DISPLAY_RESOLUTION}" STREQUAL "480x800")
-	MESSAGE("font size is 24")
-	ADD_DEFINITIONS("-DFACTORY_RESET_FONT_SIZE=24")
-ENDIF()
-
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED appcore-efl evas edje elementary
-		libsmack dbus-1 dbus-glib-1 ${PKG_MODULES} )
+pkg_check_modules(pkgs REQUIRED libsmack dbus-1 dbus-glib-1 ${PKG_MODULES} )
 
 FOREACH(flag ${pkgs_CFLAGS})
 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
@@ -73,19 +41,10 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 
 ADD_EXECUTABLE(resetCCMode ${SRCS_RESET_CCMODE})
 ADD_EXECUTABLE(rstsmack ${SRCS_RSTSMACK})
-ADD_EXECUTABLE(factory-reset-util ${SRCS_UTIL})
 ADD_EXECUTABLE(factory-reset ${SRCS})
 TARGET_LINK_LIBRARIES(rstsmack ${pkgs_LDFLAGS} -pie)
-TARGET_LINK_LIBRARIES(factory-reset-util ${pkgs_LDFLAGS} -pie)
 TARGET_LINK_LIBRARIES(factory-reset ${pkgs_LDFLAGS} -pie)
 
-ADD_CUSTOM_TARGET(factory-reset-util.edj
-		COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/images
-		${EDJ_SRCS} ${CMAKE_BINARY_DIR}/data/factory-reset-util.edj
-		DEPENDS ${EDJ_SRCS}
-)
-ADD_DEPENDENCIES(factory-reset-util factory-reset-util.edj)
-
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/script/run-factory-reset.sh DESTINATION bin)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/script/factoryreset-verify.sh DESTINATION bin)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/script/factoryreset-verify-result.sh DESTINATION bin)
@@ -93,13 +52,11 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/script/build-backup-data.sh DESTINATIO
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/script/dump-frlog.sh DESTINATION /opt/etc/dump.d/module.d)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/factory-reset.rule DESTINATION /etc/smack/accesses2.d)
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/rstsmack DESTINATION bin)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/factory-reset-util DESTINATION bin)
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/factory-reset DESTINATION bin)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/data/factory-reset-util.edj DESTINATION ${EDJDIR})
 
 IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_CC")
 	INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/resetCCMode DESTINATION bin)
 ENDIF()
 
 #add sub directory
-ADD_SUBDIRECTORY(po)
+#ADD_SUBDIRECTORY(po)