commit 77a7fa79240edfab54ca25b3851e1d3b23a3329b
author Ben Chan <benchan@chromium.org> Thu Apr 24 23:15:30 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Apr 26 01:02:49 2014 +0000
tree 25331773f33aa868ccd887911adffaa939d64a49
parent 1f01291c91ba75102868a76c826a6318f55fb098

update_engine: explicitly link against libmetrics-${BASE_VER}

libmetrics is a slotted library that depends on libchrome. update_engine
should link against the same slotted version of libchrome and
libmetrics.

BUG=None
TEST=`FEATURES=test emerge-$BOARD update_engine`
TEST=Verify that update engine binaries all depend on libmetrics-242728.so

Change-Id: I363efaba78283aefeb93f68c7508279eb82b0693
Reviewed-on: https://chromium-review.googlesource.com/197011
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

SConstruct

diff --git a/SConstruct b/SConstruct
index 032bf3e..fda628c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -161,7 +161,7 @@
                        gflags
                        glib-2.0
                        gthread-2.0
-                       metrics
+                       metrics-%s
                        policy-%s
                        protobuf
                        pthread
@@ -170,7 +170,7 @@
                        ssl
                        udev
                        vboot_host
-                       xml2""" % BASE_VER)
+                       xml2""" % (BASE_VER, BASE_VER))
 env['CPPPATH'] = ['..']
 env['BUILDERS']['ProtocolBuffer'] = proto_builder
 env['BUILDERS']['DbusBindings'] = dbus_bindings_builder