Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Side by Side Diff: content/content_tests.gypi

Issue 18161007: Replace angle_path gyp variable with regular path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@d3d11
Patch Set: rebase Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/content_gpu.gypi ('k') | gpu/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium 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': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'], 1070 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'],
1071 ], 1071 ],
1072 }], 1072 }],
1073 ['target_arch=="arm"', { 1073 ['target_arch=="arm"', {
1074 'include_dirs': [ 1074 'include_dirs': [
1075 '<(DEPTH)/third_party/openmax/il', 1075 '<(DEPTH)/third_party/openmax/il',
1076 ], 1076 ],
1077 }], 1077 }],
1078 ['OS=="win"', { 1078 ['OS=="win"', {
1079 'dependencies': [ 1079 'dependencies': [
1080 '<(angle_path)/src/build_angle.gyp:libEGL', 1080 '../third_party/angle_dx11/src/build_angle.gyp:libEGL',
1081 '<(angle_path)/src/build_angle.gyp:libGLESv2', 1081 '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2',
1082 ], 1082 ],
1083 }], 1083 }],
1084 ['(OS=="win" and win_use_allocator_shim==1) or ' 1084 ['(OS=="win" and win_use_allocator_shim==1) or '
1085 '(os_posix == 1 and OS != "android" and ' 1085 '(os_posix == 1 and OS != "android" and '
1086 ' linux_use_tcmalloc==1)', { 1086 ' linux_use_tcmalloc==1)', {
1087 'dependencies': [ 1087 'dependencies': [
1088 '../base/allocator/allocator.gyp:allocator', 1088 '../base/allocator/allocator.gyp:allocator',
1089 ], 1089 ],
1090 }], 1090 }],
1091 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { 1091 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 'resource_dir': 'shell/android/shell_apk/res', 1228 'resource_dir': 'shell/android/shell_apk/res',
1229 'additional_src_dirs': ['public/android/javatests/',], 1229 'additional_src_dirs': ['public/android/javatests/',],
1230 'is_test_apk': 1, 1230 'is_test_apk': 1,
1231 }, 1231 },
1232 'includes': [ '../build/java_apk.gypi' ], 1232 'includes': [ '../build/java_apk.gypi' ],
1233 }, 1233 },
1234 ], 1234 ],
1235 }], 1235 }],
1236 ], 1236 ],
1237 } 1237 }
OLDNEW
« no previous file with comments | « content/content_gpu.gypi ('k') | gpu/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698