Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1085)

Delta Between Two Patch Sets: tests/build_tests.gyp

Issue 13971043: Fix a couple errors in the gyp build scripts. (Closed) Base URL: https://code.google.com/p/angleproject/@master
Left Patch Set: Fix component build, but still breaks WebKit. Created 11 years, 6 months ago
Right Patch Set: Defer component build fix for later. Created 11 years, 6 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« include/GLSLANG/ShaderLang.h ('K') | « src/build_angle.gypi ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # Copyright (c) 2012 The ANGLE Project Authors. All rights reserved. 1 # Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'gtest', 8 'target_name': 'gtest',
9 'type': 'static_library', 9 'type': 'static_library',
10 'include_dirs': [ 10 'include_dirs': [
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 '../third_party/googlemock/include', 47 '../third_party/googlemock/include',
48 ], 48 ],
49 'sources': [ 49 'sources': [
50 '../third_party/googlemock/src/gmock_main.cc', 50 '../third_party/googlemock/src/gmock_main.cc',
51 ], 51 ],
52 }, 52 },
53 { 53 {
54 'target_name': 'compiler_tests', 54 'target_name': 'compiler_tests',
55 'type': 'executable', 55 'type': 'executable',
56 'dependencies': [ 56 'dependencies': [
57 '../src/build_angle.gyp:translator', 57 '../src/build_angle.gyp:translator_static',
58 'gtest', 58 'gtest',
59 'gmock', 59 'gmock',
60 ], 60 ],
61 'variables': { 61 'variables': {
62 'ANGLE_DIR': '..', 62 'ANGLE_DIR': '..',
63 }, 63 },
64 'includes': [ 64 'includes': [
65 'compiler_tests/compiler_tests.gypi', 65 'compiler_tests/compiler_tests.gypi',
66 ], 66 ],
67 'include_dirs': [ 67 'include_dirs': [
68 '../include', 68 '../include',
69 '../src', 69 '../src',
70 '../third_party/googletest/include', 70 '../third_party/googletest/include',
71 '../third_party/googlemock/include', 71 '../third_party/googlemock/include',
72 ], 72 ],
73 'sources': [ 73 'sources': [
74 'compiler_tests/compiler_test_main.cpp', 74 'compiler_tests/compiler_test_main.cpp',
75 ], 75 ],
76 }, 76 },
77 ], 77 ],
78 } 78 }
79 79
80 # Local Variables: 80 # Local Variables:
81 # tab-width:2 81 # tab-width:2
82 # indent-tabs-mode:nil 82 # indent-tabs-mode:nil
83 # End: 83 # End:
84 # vim: set expandtab tabstop=2 shiftwidth=2: 84 # vim: set expandtab tabstop=2 shiftwidth=2:
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b