OLD | NEW |
---|---|
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 # Override to dynamically link the cras (ChromeOS audio) library. | 8 # Override to dynamically link the cras (ChromeOS audio) library. |
9 'use_cras%': 0, | 9 'use_cras%': 0, |
10 # Option e.g. for Linux distributions to link pulseaudio directly | 10 # Option e.g. for Linux distributions to link pulseaudio directly |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
445 'webm/webm_video_client.h', | 445 'webm/webm_video_client.h', |
446 'webm/webm_webvtt_parser.cc', | 446 'webm/webm_webvtt_parser.cc', |
447 'webm/webm_webvtt_parser.h' | 447 'webm/webm_webvtt_parser.h' |
448 ], | 448 ], |
449 'direct_dependent_settings': { | 449 'direct_dependent_settings': { |
450 'include_dirs': [ | 450 'include_dirs': [ |
451 '..', | 451 '..', |
452 ], | 452 ], |
453 }, | 453 }, |
454 'conditions': [ | 454 'conditions': [ |
455 ['arm_neon==1', { | 455 ['target_arch=="arm" and arm_version>=7 and arm_neon==1', { |
Ami GONE FROM CHROMIUM
2013/07/10 21:18:00
FWIW, this will break when targeting ios (device,
DaleCurtis
2013/07/10 23:01:34
Ugh. How does that even work at all? No code outsi
Ami GONE FROM CHROMIUM
2013/07/10 23:04:41
Very little is in fact built into bling...
DaleCurtis
2013/07/11 21:04:34
I've dropped these changes from the latest patch s
| |
456 'defines': [ | 456 'defines': [ |
457 'USE_NEON' | 457 'USE_NEON' |
458 ], | 458 ], |
459 }], | 459 }], |
460 ['OS!="ios"', { | 460 ['OS!="ios"', { |
461 'dependencies': [ | 461 'dependencies': [ |
462 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', | 462 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', |
463 '../gpu/gpu.gyp:command_buffer_common', | 463 '../gpu/gpu.gyp:command_buffer_common', |
464 'shared_memory_support', | 464 'shared_memory_support', |
465 ], | 465 ], |
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
978 'webm/cluster_builder.h', | 978 'webm/cluster_builder.h', |
979 'webm/tracks_builder.cc', | 979 'webm/tracks_builder.cc', |
980 'webm/tracks_builder.h', | 980 'webm/tracks_builder.h', |
981 'webm/webm_cluster_parser_unittest.cc', | 981 'webm/webm_cluster_parser_unittest.cc', |
982 'webm/webm_content_encodings_client_unittest.cc', | 982 'webm/webm_content_encodings_client_unittest.cc', |
983 'webm/webm_parser_unittest.cc', | 983 'webm/webm_parser_unittest.cc', |
984 'webm/webm_tracks_parser_unittest.cc', | 984 'webm/webm_tracks_parser_unittest.cc', |
985 'webm/webm_webvtt_parser_unittest.cc', | 985 'webm/webm_webvtt_parser_unittest.cc', |
986 ], | 986 ], |
987 'conditions': [ | 987 'conditions': [ |
988 ['arm_neon==1', { | 988 ['target_arch=="arm" and arm_version>=7 and arm_neon==1', { |
Ami GONE FROM CHROMIUM
2013/07/09 23:20:08
Why not instead change build/common.gypi to not de
DaleCurtis
2013/07/10 21:06:31
Hmm, that's non-trivial since target_arch isn't de
| |
989 'defines': [ | 989 'defines': [ |
990 'USE_NEON' | 990 'USE_NEON' |
991 ], | 991 ], |
992 }], | 992 }], |
993 ['OS!="ios"', { | 993 ['OS!="ios"', { |
994 'dependencies': [ | 994 'dependencies': [ |
995 '../gpu/gpu.gyp:command_buffer_common', | 995 '../gpu/gpu.gyp:command_buffer_common', |
996 'shared_memory_support', | 996 'shared_memory_support', |
997 ], | 997 ], |
998 }], | 998 }], |
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1628 'sources': [ | 1628 'sources': [ |
1629 'tools/media_bench/media_bench.cc', | 1629 'tools/media_bench/media_bench.cc', |
1630 ], | 1630 ], |
1631 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 1631 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
1632 'msvs_disabled_warnings': [ 4267, ], | 1632 'msvs_disabled_warnings': [ 4267, ], |
1633 }, | 1633 }, |
1634 ], | 1634 ], |
1635 }], | 1635 }], |
1636 ], | 1636 ], |
1637 } | 1637 } |
OLD | NEW |