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

Side by Side Diff: media/media_nacl.gyp

Issue 1097153002: NaCl/GYP: remove references to prep_toolchain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Edit Created 5 years, 8 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 | « jingle/jingle_nacl.gyp ('k') | mojo/mojo_nacl_untrusted.gyp » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../native_client/build/untrusted.gypi', 10 '../native_client/build/untrusted.gypi',
11 ], 11 ],
12 'conditions': [ 12 'conditions': [
13 ['disable_nacl==0 and disable_nacl_untrusted==0', { 13 ['disable_nacl==0 and disable_nacl_untrusted==0', {
14 'targets': [ 14 'targets': [
15 { 15 {
16 'target_name': 'shared_memory_support_nacl', 16 'target_name': 'shared_memory_support_nacl',
17 'type': 'none', 17 'type': 'none',
18 'variables': { 18 'variables': {
19 'nacl_untrusted_build': 1, 19 'nacl_untrusted_build': 1,
20 'nlib_target': 'libshared_memory_support_nacl.a', 20 'nlib_target': 'libshared_memory_support_nacl.a',
21 'build_glibc': 0, 21 'build_glibc': 0,
22 'build_newlib': 0, 22 'build_newlib': 0,
23 'build_irt': 1, 23 'build_irt': 1,
24 'build_pnacl_newlib': 0, 24 'build_pnacl_newlib': 0,
25 'build_nonsfi_helper': 1, 25 'build_nonsfi_helper': 1,
26 }, 26 },
27 'dependencies': [ 27 'dependencies': [
28 '../base/base_nacl.gyp:base_nacl', 28 '../base/base_nacl.gyp:base_nacl',
29 '../base/base_nacl.gyp:base_nacl_nonsfi', 29 '../base/base_nacl.gyp:base_nacl_nonsfi',
30 '../native_client/tools.gyp:prep_toolchain',
31 ], 30 ],
32 'defines': [ 31 'defines': [
33 'MEDIA_IMPLEMENTATION', 32 'MEDIA_IMPLEMENTATION',
34 ], 33 ],
35 'include_dirs': [ 34 'include_dirs': [
36 '..', 35 '..',
37 ], 36 ],
38 'includes': [ 37 'includes': [
39 'shared_memory_support.gypi', 38 'shared_memory_support.gypi',
40 ], 39 ],
41 'sources': [ 40 'sources': [
42 '<@(shared_memory_support_sources)', 41 '<@(shared_memory_support_sources)',
43 ], 42 ],
44 }, # end of target 'shared_memory_support_nacl' 43 }, # end of target 'shared_memory_support_nacl'
45 { 44 {
46 'target_name': 'media_yuv_nacl', 45 'target_name': 'media_yuv_nacl',
47 'type': 'none', 46 'type': 'none',
48 'variables': { 47 'variables': {
49 'nlib_target': 'libmedia_yuv_nacl.a', 48 'nlib_target': 'libmedia_yuv_nacl.a',
50 'build_glibc': 0, 49 'build_glibc': 0,
51 'build_newlib': 0, 50 'build_newlib': 0,
52 'build_pnacl_newlib': 1, 51 'build_pnacl_newlib': 1,
53 }, 52 },
54 'dependencies': [
55 '../native_client/tools.gyp:prep_toolchain',
56 ],
57 'sources': [ 53 'sources': [
58 'base/media.cc', 54 'base/media.cc',
59 'base/media.h', 55 'base/media.h',
60 'base/media_stub.cc', 56 'base/media_stub.cc',
61 'base/simd/convert_rgb_to_yuv.h', 57 'base/simd/convert_rgb_to_yuv.h',
62 'base/simd/convert_rgb_to_yuv_c.cc', 58 'base/simd/convert_rgb_to_yuv_c.cc',
63 'base/simd/convert_yuv_to_rgb.h', 59 'base/simd/convert_yuv_to_rgb.h',
64 'base/simd/convert_yuv_to_rgb_c.cc', 60 'base/simd/convert_yuv_to_rgb_c.cc',
65 'base/simd/filter_yuv.h', 61 'base/simd/filter_yuv.h',
66 'base/simd/filter_yuv_c.cc', 62 'base/simd/filter_yuv_c.cc',
67 'base/yuv_convert.cc', 63 'base/yuv_convert.cc',
68 'base/yuv_convert.h', 64 'base/yuv_convert.h',
69 ], 65 ],
70 }, # end of target 'media_yuv_nacl' 66 }, # end of target 'media_yuv_nacl'
71 ], 67 ],
72 }], 68 }],
73 ], 69 ],
74 } 70 }
OLDNEW
« no previous file with comments | « jingle/jingle_nacl.gyp ('k') | mojo/mojo_nacl_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698