Merge pull request #462 from WebPlatformForEmbedded/development/displayinfo

DisplayInfo: moved from ThunderNanoServices to ThunderNanoServiceRDK

Author: pwielders

package/wpe/wpeframework-plugins/wpeframework-plugins.mk

@@ -178,14 +178,6 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO),y)
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_DEVICEINFO=ON
 endif
 
-ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_DISPLAYINFO),y)
-WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_DISPLAYINFO=ON
-WPEFRAMEWORK_PLUGINS_CONF_OPTS += [email protected]:WebPlatformForEmbedded/DisplayInfo-brcm.git
-ifeq ($(BR2_PACKAGE_RPI_FIRMWARE),y)
-WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_DISPLAYINFO_HDCP_LEVEL="Hdcp1X"
-endif
-endif
-
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_DSRESOLUTION),y)
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_DSRESOLUTION=ON
 ifeq ($(BR2_PACKAGE_DSRESOLUTION_WITH_DUMMY_DSHAL), y)

package/wpe/wpeframework-rdkservices/wpeframework-rdkservices.mk

@@ -44,6 +44,14 @@ endif
 
 endif
 
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_DISPLAYINFO),y)
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DISPLAYINFO=ON
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += [email protected]:WebPlatformForEmbedded/DisplayInfo-brcm.git
+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE),y)
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DISPLAYINFO_HDCP_LEVEL="Hdcp1X"
+endif
+endif
+
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_MONITOR),y)
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_MONITOR=ON
 ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_MONITOR_WEBKITBROWSER),"")