commit 22ab6f06d0fc3e98ee51745cb5d4b902453ab7f5
author Utkarsh Sanghi <usanghi@google.com> Wed Oct 28 22:41:50 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 28 22:41:50 2015 +0000
tree 435287fe6d60fdcb66737476fee580968e9bd829
parent f5b0798f7522bcf030f58f2024e2c37c1f12659a
parent 5f8ca6f3d1405102961386e2747400d183527507

Merge "trunks: Fix generator bug in handle serialization"

Makefile

diff --git a/Makefile b/Makefile
index c8cb335..9afcbd7 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 
 include common.mk
 
-PC_DEPS = libchrome-$(BASE_VER) libchromeos-$(BASE_VER) openssl
+PC_DEPS = libchrome-$(BASE_VER) libbrillo-$(BASE_VER) openssl
 PC_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(PC_DEPS))
 PC_LIBS := $(shell $(PKG_CONFIG) --libs $(PC_DEPS))
 

trunks.gyp

diff --git a/trunks.gyp b/trunks.gyp
index 4203bc5..d9c709c 100644
--- a/trunks.gyp
+++ b/trunks.gyp
@@ -19,8 +19,8 @@
     'includes': ['../../../platform2/common-mk/common.gypi'],
     'variables': {
       'deps': [  # This is a list of pkg-config dependencies
+        'libbrillo-<(libbase_ver)',
         'libchrome-<(libbase_ver)',
-        'libchromeos-<(libbase_ver)',
         'openssl',
         'protobuf-lite',
       ],