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

Side by Side Diff: media/media_nacl.gyp

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll DEPS to fix cros, rebase. Created 5 years, 6 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 | « media/media.gyp ('k') | media/media_unittests.isolate » ('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',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'type': 'none', 46 'type': 'none',
47 'variables': { 47 'variables': {
48 'nlib_target': 'libmedia_yuv_nacl.a', 48 'nlib_target': 'libmedia_yuv_nacl.a',
49 'build_glibc': 0, 49 'build_glibc': 0,
50 'build_newlib': 0, 50 'build_newlib': 0,
51 'build_pnacl_newlib': 1, 51 'build_pnacl_newlib': 1,
52 }, 52 },
53 'sources': [ 53 'sources': [
54 'base/media.cc', 54 'base/media.cc',
55 'base/media.h', 55 'base/media.h',
56 'base/media_stub.cc',
57 'base/simd/convert_rgb_to_yuv.h', 56 'base/simd/convert_rgb_to_yuv.h',
58 'base/simd/convert_rgb_to_yuv_c.cc', 57 'base/simd/convert_rgb_to_yuv_c.cc',
59 'base/simd/convert_yuv_to_rgb.h', 58 'base/simd/convert_yuv_to_rgb.h',
60 'base/simd/convert_yuv_to_rgb_c.cc', 59 'base/simd/convert_yuv_to_rgb_c.cc',
61 'base/simd/filter_yuv.h', 60 'base/simd/filter_yuv.h',
62 'base/simd/filter_yuv_c.cc', 61 'base/simd/filter_yuv_c.cc',
63 'base/yuv_convert.cc', 62 'base/yuv_convert.cc',
64 'base/yuv_convert.h', 63 'base/yuv_convert.h',
65 ], 64 ],
65 'defines': [
66 'MEDIA_DISABLE_FFMPEG',
67 ],
66 }, # end of target 'media_yuv_nacl' 68 }, # end of target 'media_yuv_nacl'
67 ], 69 ],
68 }], 70 }],
69 ], 71 ],
70 } 72 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | media/media_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698