--- a/commondrm/group/bld.inf Tue Aug 31 15:29:38 2010 +0300
+++ b/commondrm/group/bld.inf Wed Sep 01 12:21:16 2010 +0100
@@ -39,20 +39,24 @@
../rom/DRMEncryptorResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( drmencryptorresources.iby )
../rom/DRMRightsManagerUI.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmrightsmanagerui.iby )
../rom/DRMRightsManagerUIResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( drmrightsmanageruiresources.iby )
+../rom/drmsettingsplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmsettingsplugin.iby )
+../rom/drmsettingspluginresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( drmsettingspluginresources.iby )
../rom/drmutility.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmutility.iby )
../rom/drmutility_resources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( drmutility_resources.iby )
../rom/drmserviceapiwrapper.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmserviceapiwrapper.iby )
../rom/drmrightsstoringlocation.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmrightsstoringlocation.iby )
-../rom/drmbrowserlauncher.iby CORE_MW_LAYER_IBY_EXPORT_PATH( drmbrowserlauncher.iby )
PRJ_MMPFILES
+// DRMEncryptor
+../drmencryptor/group/DRMEncryptor.mmp
+
+// DRMSettingsPlugin
+../drmsettingsplugin/group/drmsettingsplugin.mmp
+
// DRMRightsManagerUi
../drmrightsmanagerui/group/DRMRightsManager.mmp
-// drmui
-#include "../drmui/group/bld.inf"
-
// drmutility
#include "../drmutility/group/bld.inf"
@@ -73,6 +77,19 @@
PRJ_EXTENSIONS
START EXTENSION s60/mifconv
+OPTION TARGETFILE drmencryptor.mif
+OPTION HEADERFILE drmencryptor.mbg
+OPTION SOURCES -c8,8 qgn_menu_DRMEncryptor_cxt -c8 icon
+OPTION SOURCEDIR ../drmencryptor/group
+END
+
+START EXTENSION s60/mifconv
+OPTION TARGETFILE drmencryptor_aif.mif
+OPTION SOURCES -c8,8 qgn_menu_drmencryptor -c8 icon
+OPTION SOURCEDIR ../drmencryptor/group
+END
+
+START EXTENSION s60/mifconv
OPTION TARGETFILE drmrightsmanager.mif
OPTION HEADERFILE drmrightsmanager.mbg
OPTION SOURCES \