From 491f174949cd8d612728bc9040fe9e7a0950b7d8 Mon Sep 17 00:00:00 2001 From: Mark Mentovai Date: Tue, 19 Sep 2017 14:43:07 -0400 Subject: Fix googletest/googlemock build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. testing.gyp is a gyp file, not a gypi file. It is only referenced in “dependencies” sections. The gypi extension is used for files that are included by an “includes” section. 2. Update paths in testing.gyp to reflect the real locations of googletest and googlemock following their merge into a single repository. Change-Id: If9c356d93aa5ffda54af46fbed648baa2274dac6 Reviewed-on: https://chromium-review.googlesource.com/673404 Reviewed-by: Mike Frysinger --- src/processor/processor.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/processor') diff --git a/src/processor/processor.gyp b/src/processor/processor.gyp index 083a3237..d09a8953 100644 --- a/src/processor/processor.gyp +++ b/src/processor/processor.gyp @@ -176,8 +176,8 @@ ], 'dependencies': [ 'processor', - '../build/testing.gypi:gmock', - '../build/testing.gypi:gtest', + '../build/testing.gyp:gmock', + '../build/testing.gyp:gtest', ], }, ], -- cgit v1.2.1