Fixing Build error

The conflict resolving has some missing for 6f29260d365e5d81caab020c1430d61e7ab40b51.
Adding conflict resolving for fixing build error.

Change-Id: Ibb270807e4887075e9a7b70b40e409e7da0d12da

diff --git a/src/view/webkit/injected-bundle/CMakeLists.txt b/src/view/webkit/injected-bundle/CMakeLists.txt
index 43596da..099c9ef 100644 (file)
--- a/src/view/webkit/injected-bundle/CMakeLists.txt
+++ b/src/view/webkit/injected-bundle/CMakeLists.txt
@@ -20,7 +20,6 @@ ADD_DEFINITIONS("-DWRT_BUNDLE_LOG")
 
 include(FindPkgConfig)
 
-IF(DECRYPT_SUPPORT)
 PKG_CHECK_MODULES(INJECTED_BUNDLE_DEP
     dpl-efl
     dpl-utils-efl
@@ -33,20 +32,6 @@ PKG_CHECK_MODULES(INJECTED_BUNDLE_DEP
     wrt-dispatch-event
     REQUIRED
 )
-ELSE(DECRYPT_SUPPORT)
-PKG_CHECK_MODULES(INJECTED_BUNDLE_DEP
-    dpl-efl
-    dpl-utils-efl
-    dpl-wrt-dao-ro
-    dpl-encryption
-    ewebkit2
-    vconf
-    libprivilege-control
-    libiri
-    libpcrecpp
-    REQUIRED
-)
-ENDIF(DECRYPT_SUPPORT)
 
 SET(INJECTED_BUNDLE_SOURCES
     ${PROJECT_SOURCE_DIR}/src/view/webkit/injected-bundle/wrt-injected-bundle.cpp