commit 93e4c0958b0aa8467690d95c6a3dc81336dae631
Author: Ross Burton <ross.burton@intel.com>
Date:   Wed Jan 28 16:42:26 2015 +0000

    chromium: add PACKAGECONFIG to control libgnome-keyring usage

    Add libgnome-keyring to RDEPENDS as it is loaded dynamically by default.

    Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/recipes-browser/chromium/chromium.inc b/recipes-browser/chromium/chromium.inc
index ad976f9..33608fd 100644
--- a/recipes-browser/chromium/chromium.inc
+++ b/recipes-browser/chromium/chromium.inc
@@ -18,7 +18,7 @@

 DESCRIPTION = "Chromium browser"
 LICENSE = "BSD"
-DEPENDS = "xz-native pciutils pulseaudio cairo nss zlib-native libav libgnome-keyring cups ninja-native gconf libexif pango libdrm"
+DEPENDS = "xz-native pciutils pulseaudio cairo nss zlib-native libav cups ninja-native gconf libexif pango libdrm"
 SRC_URI = "\
         http://gsdview.appspot.com/chromium-browser-official/${P}.tar.xz \
         file://include.gypi \
@@ -111,11 +111,12 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"

 inherit gettext

-PACKAGECONFIG ??= "use-egl"
+PACKAGECONFIG ??= "use-egl gnome-keyring"

 # this makes sure the dependencies for the EGL mode are present; otherwise, the configure scripts
 # automatically and silently fall back to GLX
 PACKAGECONFIG[use-egl] = ",,virtual/egl virtual/libgles2"
+PACKAGECONFIG[gnome-keyring] = ",,libgnome-keyring,libgnome-keyring"

 EXTRA_OEGYP =  " \
    -Dangle_use_commit_id=0 \
@@ -124,6 +125,7 @@ EXTRA_OEGYP =   " \
    -Ddisable_fatal_linker_warnings=1 \
    ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '', '-Dlinux_use_gold_binary=0', d)} \
    ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '', '-Dlinux_use_gold_flags=0', d)} \
+   ${@base_contains('PACKAGECONFIG', 'gnome-keyring', '-Duse_gnome_keyring=1', '-Duse_gnome_keyring=0', d)} \
    -I ${WORKDIR}/oe-defaults.gypi \
    -I ${WORKDIR}/include.gypi \
    ${@bb.utils.contains('PACKAGECONFIG', 'component-build', '-I ${WORKDIR}/component-build.gypi', '', d)} \