A-DRM applied

Change-Id: I7bc2763acde255e6e01da993af3b4bf6a952fa1d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13e1293..a9bcbaa 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
 SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} ${OSP_COMPILER_FLAGS}")
 
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw -lxml2 -lpkgmgr_installer -lpkgmgr_parser -lglib-2.0 -lapp2ext" -Wl,--allow-shlib-undefined)
-#TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib -ldrm-service-core-intel")
+TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib -ldrm-service-core-intel")
 
 ADD_SUBDIRECTORY(plugin)
 

diff --git a/packaging/osp-installer.spec b/packaging/osp-installer.spec
index 6de225f..328ac30 100755 (executable)
--- a/packaging/osp-installer.spec
+++ b/packaging/osp-installer.spec
@@ -15,7 +15,7 @@ BuildRequires:  pkgconfig(pkgmgr-parser)
 BuildRequires:  pkgconfig(app2sd)
 BuildRequires:  pkgconfig(libwbxml2)
 BuildRequires:  pkgconfig(osp-appfw)
-#BuildRequires:  pkgconfig(drm-service-core-intel)
+BuildRequires:  pkgconfig(drm-service-core-intel)
 
 BuildRequires:  osp-appfw-internal-devel
 BuildRequires: boost-devel

diff --git a/src/Util/InstallerUtil.cpp b/src/Util/InstallerUtil.cpp
index 61d0eb7..6b47f51 100755 (executable)
--- a/src/Util/InstallerUtil.cpp
+++ b/src/Util/InstallerUtil.cpp
@@ -33,7 +33,7 @@
 #include "InstallerDefs.h"
 #include "InstallerUtil.h"
 
-//#include <drm-oem-intel.h>
+#include <drm-oem-intel.h>
 
 using namespace Osp::Base;
 using namespace Osp::Base::Collection;
@@ -342,7 +342,7 @@ InstallerUtil::IsDrmFile(const Osp::Base::String& path)
            pFilePath = _StringConverter::CopyToCharArrayN(path);
            TryCatch(pFilePath, r = GetLastResult(), "[osp-installer] pFilePath is null");
 
-//         isDrm = drm_oem_intel_isDrmFile(pFilePath);
+           isDrm = drm_oem_intel_isDrmFile(pFilePath);
                if(isDrm == 1)
            {
                        AppLogTag(OSP_INSTALLER, "IsDrmFile() called, packagePath=%ls is drm file", path.GetPointer());
@@ -369,7 +369,7 @@ InstallerUtil::DecryptPackage(const Osp::Base::String& packagePath)
            pFilePath = _StringConverter::CopyToCharArrayN(packagePath);
            TryCatch(pFilePath, r = GetLastResult(), "[osp-installer] pFilePath is null");
 
-//         result = drm_oem_intel_decrypt_package(pFilePath, pFilePath);
+           result = drm_oem_intel_decrypt_package(pFilePath, pFilePath);
            if(result  == 1)
            {
                AppLogTag(OSP_INSTALLER, "DecryptPackage() called, packagePath=%ls, decrpyt success", packagePath.GetPointer());