Commit 1275e815 authored by tfarina's avatar tfarina Committed by Commit bot

gpu: Fix some jmadill's TODOs.

BUG=None
TEST=./build/gyp_chromium still works
R=sievers@chromium.org

Review URL: https://codereview.chromium.org/1038743003

Cr-Commit-Position: refs/heads/master@{#322445}
parent 3d5f51b2
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "base/test/test_suite.h" #include "base/test/test_suite.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/angle/tests/angle_tests/ANGLETest.h" #include "third_party/angle/src/tests/end2end_tests/ANGLETest.h"
namespace { namespace {
......
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
'type': '<(gtest_target_type)', 'type': '<(gtest_target_type)',
'includes': [ 'includes': [
'../third_party/angle/build/common_defines.gypi', '../third_party/angle/build/common_defines.gypi',
'../third_party/angle/tests/angle_unittests.gypi', '../third_party/angle/src/tests/angle_unittests.gypi',
], ],
'dependencies': [ 'dependencies': [
'../base/base.gyp:base', '../base/base.gyp:base',
...@@ -140,8 +140,7 @@ ...@@ -140,8 +140,7 @@
'..', '..',
'../third_party/angle/include', '../third_party/angle/include',
], ],
'sources': 'sources': [
[
'angle_unittest_main.cc', 'angle_unittest_main.cc',
], ],
}, },
...@@ -711,13 +710,11 @@ ...@@ -711,13 +710,11 @@
'../base/base.gyp:base', '../base/base.gyp:base',
'../base/base.gyp:test_support_base', '../base/base.gyp:test_support_base',
], ],
'includes': 'includes': [
[
'../third_party/angle/build/common_defines.gypi', '../third_party/angle/build/common_defines.gypi',
'../third_party/angle/tests/angle_end2end_tests.gypi', '../third_party/angle/src/tests/angle_end2end_tests.gypi',
], ],
'sources': 'sources': [
[
'angle_end2end_tests_main.cc', 'angle_end2end_tests_main.cc',
], ],
}, },
...@@ -729,13 +726,11 @@ ...@@ -729,13 +726,11 @@
'../base/base.gyp:base', '../base/base.gyp:base',
'../base/base.gyp:test_support_base', '../base/base.gyp:test_support_base',
], ],
'includes': 'includes': [
[
'../third_party/angle/build/common_defines.gypi', '../third_party/angle/build/common_defines.gypi',
'../third_party/angle/src/tests/angle_perftests.gypi', '../third_party/angle/src/tests/angle_perftests.gypi',
], ],
'sources': 'sources': [
[
'angle_perftests_main.cc', 'angle_perftests_main.cc',
], ],
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment