commit b69aeca51481055c58780981d9e8aa1aef90491b
author Allen Webb <allenwebb@google.com> Tue Apr 09 16:45:40 2019 -0700
committer chrome-bot <chrome-bot@chromium.org> Thu Apr 18 19:51:49 2019 -0700
tree c366bd711ea4d178a6437e3ef091ade3d6a9ccfc
parent 240acaa806e64238b0fda54b478209b6aec430b3

Makefile: Replace calls to gtest-config and gmock-config.

These helper utils are no longer available.

BUG=chromium:940320
TEST=PreCQ passes

Change-Id: Iebff68523e2331b29f0c4b6157c59c13e6c77395
Reviewed-on: https://chromium-review.googlesource.com/1560325
Commit-Ready: Allen Webb <allenwebb@google.com>
Tested-by: Allen Webb <allenwebb@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

Makefile

diff --git a/Makefile b/Makefile
index b8d1c71..9ecdb1a 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@
                           $(filter %dm-bht-userspace.o,$(C_OBJECTS)) \
                            CXX_STATIC_LIBRARY(kernel/libkernel.pie.a) \
                            CXX_STATIC_LIBRARY(simple_file/libsimple_file.pie.a)
-UNITTEST_LIBS := $(shell gmock-config --libs) $(shell gtest-config --libs)
+UNITTEST_LIBS := -lgmock -lgtest -pthread -lpthread
 CXX_BINARY(verity_testrunner): LDLIBS += $(UNITTEST_LIBS)
 
 clean: CLEAN(verity_testrunner)