2 files changed, 25 insertions, 12 deletions
diff --git a/recipes-demo-hmi/navigation/libnaviapi-agl_git.bb b/recipes-demo-hmi/navigation/libnaviapi-agl_git.bb
new file mode 100644
index 00000000..87087e1a
--- /dev/null
+++ b/recipes-demo-hmi/navigation/libnaviapi-agl_git.bb
@@ -0,0 +1,18 @@
+SUMMARY     = "AGL Navigation API Library"
+DESCRIPTION = "AGL Navigation API ver 0.1.0 library for C++"
+HOMEPAGE    = "https://github.com/AGLExport/agl-service-navigation"
+LICENSE     = "Apache-2.0"
+SECTION     = "libs"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
+
+DEPENDS = "af-binder json-c libdbus-c++ af-main-native"
+
+inherit cmake
+
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-navigation;protocol=https;branch=${AGL_BRANCH}"
+SRCREV = "${AGL_APP_REVISION}"
+S = "${WORKDIR}/git"
+
+# FIXME: Remove once CMake+ninja issues are resolved
+OECMAKE_GENERATOR = "Unix Makefiles"
diff --git a/recipes-demo-hmi/navigation/poiapp_git.bb b/recipes-demo-hmi/navigation/poiapp_git.bb
index 9c9292b0..87263e10 100644
--- a/recipes-demo-hmi/navigation/poiapp_git.bb
+++ b/recipes-demo-hmi/navigation/poiapp_git.bb
@@ -6,20 +6,15 @@ SECTION     = "apps"
 LICENSE          = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=947b2d60ca3872e172034438e9801200"
 
-inherit cmake_qt5 pkgconfig
-inherit aglwgt
-
-DEPENDS += " qtbase json-c libnaviapi-agl \
-             af-binder qlibwindowmanager libhomescreen \
+DEPENDS += "qtbase json-c libnaviapi-agl \
+            qlibwindowmanager libhomescreen \
            "
 
-RDEPENDS_${PN} =  " qtbase \
-                  "
-
-SRCREV = "c2691cb265d9198542482a860f1df378e8c2708b"
-SRC_URI = "git://github.com/AGLExport/genivi-navi-yelp-client.git;branch=agl \
-           file://0001-add-display-permission.patch \
-          "
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/poi-yelp;protocol=https;branch=${AGL_BRANCH}"
+SRCREV = "${AGL_APP_REVISION}"
 
 S = "${WORKDIR}/git"
 
+inherit cmake_qt5 pkgconfig aglwgt
+
+RDEPENDS_${PN} =  "qtbase"