X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-wam%2Fwam%2Fwam_git.bb;h=f76641e51dec8395ac6a5d29b2151602107e349f;hb=f27379d2dc3656fea13e34ab166f3d3b6c2a5e1b;hp=ec1697c5a32e39e544dcc30c2c954abe64262acb;hpb=230acce4b1462b0c86e4fc90a3dec1f4f19c7bc1;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-wam/wam/wam_git.bb b/recipes-wam/wam/wam_git.bb
index ec1697c5a..f76641e51 100644
--- a/recipes-wam/wam/wam_git.bb
+++ b/recipes-wam/wam/wam_git.bb
@@ -3,51 +3,39 @@ AUTHOR = "Jani Hautakangas <jani.hautakangas@lge.com>"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-inherit cmake pkgconfig
+DEPENDS = "glib-2.0 jsoncpp boost protobuf protobuf-native grpc grpc-native"
 
-DEPENDS = "glib-2.0 jsoncpp boost chromium protobuf protobuf-native libxml2"
+SRC_URI = "\
+    git://github.com/igalia/${BPN}.git;branch=@58.agl;protocol=https \
+    file://WebAppMgrCli \
+    file://WebAppMgr.service \
+    file://WebAppMgr.env \
+    file://WebAppMgr-cef.env \
+"
 
-EXTRA_OECMAKE = "\
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=${prefix} \
-    -DPLATFORM_NAME=${@'${DISTRO}'.upper().replace('-', '_')} \
-    -DCHROMIUM_SRC_DIR=${STAGING_INCDIR}/chromium"
+SRCREV = "4fbd6e648913bcf0fba63e4460eb44242c11f71b"
 
-PR="r0"
+PV = "ose58.agl"
+
+S = "${WORKDIR}/git"
 
-PROVIDES += "virtual/webruntime"
-RPROVIDES:${PN} += "virtual/webruntime"
+inherit cmake pkgconfig systemd
 
-# Disable some of securit_flags
+# Disable some of security flags
 # Disable D_FORTIFY_SOURCE=2 and -fstack-protector-strong
 # Refer conf/distro/include/security_flags.inc in meta-webos/conf/distro/include/webos.inc
 lcl_maybe_fortify = ""
 SECURITY_STACK_PROTECTOR = ""
 
-SRC_URI = "\
-    git://github.com/igalia/${BPN}.git;branch=@58.agl;protocol=https \
-    file://WebAppMgr.service \
-    file://WebAppMgr.env \
-"
-S = "${WORKDIR}/git"
-SRCREV = "491dcd13a2d57ba57cfcdc333b5d2d8e17cdc65e"
-
-PV = "ose58.agl"
+SYSTEMD_SERVICE:${PN} = "WebAppMgr.service"
 
 do_install:append() {
     install -v -d ${D}${sysconfdir}/wam
     install -v -m 644 ${S}/files/launch/security_policy.conf ${D}${sysconfdir}/wam/security_policy.conf
-    install -v -d ${D}${systemd_user_unitdir}
-    install -v -m 644 ${WORKDIR}/WebAppMgr.service ${D}${systemd_user_unitdir}/WebAppMgr.service
-    install -v -d ${D}${sysconfdir}/default/
-    install -v -m 644 ${WORKDIR}/WebAppMgr.env ${D}${sysconfdir}/default/WebAppMgr.env
-    ln -snf WebAppMgr ${D}${bindir}/web-runtime
-    install -v -d ${D}${systemd_user_unitdir}/agl-session.target.wants
-    ln -sf ../WebAppMgr.service ${D}${systemd_user_unitdir}/agl-session.target.wants/
+    install -v -D -m 644 ${WORKDIR}/WebAppMgr.service ${D}${systemd_system_unitdir}/WebAppMgr.service
+    install -v -D -m 755 ${WORKDIR}/WebAppMgrCli ${D}${bindir}/WebAppMgrCli
 }
 
-FILES:${PN} += "${sysconfdir}/init ${sysconfdir}/wam ${libdir}/webappmanager/plugins/*.so ${systemd_user_unitdir}"
-
 CXXFLAGS:append:agl-devel = " -DAGL_DEVEL"
 
 do_install:append:agl-devel() {
@@ -56,3 +44,12 @@ do_install:append:agl-devel() {
     touch ${D}${localstatedir}/agl-devel/preferences/debug_system_apps
     touch ${D}${localstatedir}/agl-devel/preferences/devmode_enabled
 }
+
+require wam-cef.inc
+
+FILES:${PN} += "${sysconfdir}/init \
+                ${sysconfdir}/wam \
+                ${bindir} \
+                ${libdir}/webappmanager/plugins/*.so"
+
+RDEPENDS:${PN} += " bash grpc-web-proxy"