| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") | 
| 6 import("//build/config/arm.gni") | 6 import("//build/config/arm.gni") | 
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") | 
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") | 
| 9 import("//build/config/linux/pkg_config.gni") | 9 import("//build/config/linux/pkg_config.gni") | 
| 10 import("//media/media_options.gni") | 10 import("//media/media_options.gni") | 
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 111     "media.h", | 111     "media.h", | 
| 112     "media_client.cc", | 112     "media_client.cc", | 
| 113     "media_client.h", | 113     "media_client.h", | 
| 114     "media_keys.cc", | 114     "media_keys.cc", | 
| 115     "media_keys.h", | 115     "media_keys.h", | 
| 116     "media_log.cc", | 116     "media_log.cc", | 
| 117     "media_log.h", | 117     "media_log.h", | 
| 118     "media_log_event.h", | 118     "media_log_event.h", | 
| 119     "media_permission.cc", | 119     "media_permission.cc", | 
| 120     "media_permission.h", | 120     "media_permission.h", | 
|  | 121     "media_resources.cc", | 
|  | 122     "media_resources.h", | 
| 121     "media_switches.cc", | 123     "media_switches.cc", | 
| 122     "media_switches.h", | 124     "media_switches.h", | 
| 123     "mime_util.cc", | 125     "mime_util.cc", | 
| 124     "mime_util.h", | 126     "mime_util.h", | 
| 125     "moving_average.cc", | 127     "moving_average.cc", | 
| 126     "moving_average.h", | 128     "moving_average.h", | 
| 127     "multi_channel_resampler.cc", | 129     "multi_channel_resampler.cc", | 
| 128     "multi_channel_resampler.h", | 130     "multi_channel_resampler.h", | 
| 129     "null_video_sink.cc", | 131     "null_video_sink.cc", | 
| 130     "null_video_sink.h", | 132     "null_video_sink.h", | 
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 329 | 331 | 
| 330 source_set("test_support") { | 332 source_set("test_support") { | 
| 331   testonly = true | 333   testonly = true | 
| 332   sources = [ | 334   sources = [ | 
| 333     "fake_audio_render_callback.cc", | 335     "fake_audio_render_callback.cc", | 
| 334     "fake_audio_render_callback.h", | 336     "fake_audio_render_callback.h", | 
| 335     "fake_audio_renderer_sink.cc", | 337     "fake_audio_renderer_sink.cc", | 
| 336     "fake_audio_renderer_sink.h", | 338     "fake_audio_renderer_sink.h", | 
| 337     "fake_demuxer_stream.cc", | 339     "fake_demuxer_stream.cc", | 
| 338     "fake_demuxer_stream.h", | 340     "fake_demuxer_stream.h", | 
|  | 341     "fake_media_resources.cc", | 
|  | 342     "fake_media_resources.h", | 
| 339     "fake_output_device.cc", | 343     "fake_output_device.cc", | 
| 340     "fake_output_device.h", | 344     "fake_output_device.h", | 
| 341     "fake_text_track_stream.cc", | 345     "fake_text_track_stream.cc", | 
| 342     "fake_text_track_stream.h", | 346     "fake_text_track_stream.h", | 
| 343     "gmock_callback_support.h", | 347     "gmock_callback_support.h", | 
| 344     "mock_audio_renderer_sink.cc", | 348     "mock_audio_renderer_sink.cc", | 
| 345     "mock_audio_renderer_sink.h", | 349     "mock_audio_renderer_sink.h", | 
| 346     "mock_demuxer_host.cc", | 350     "mock_demuxer_host.cc", | 
| 347     "mock_demuxer_host.h", | 351     "mock_demuxer_host.h", | 
| 348     "mock_filters.cc", | 352     "mock_filters.cc", | 
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 527       if (is_posix) { | 531       if (is_posix) { | 
| 528         yasm_flags += [ "-DELF" ] | 532         yasm_flags += [ "-DELF" ] | 
| 529         if (current_cpu == "x64") { | 533         if (current_cpu == "x64") { | 
| 530           # TODO(ajwong): Why isn't this true in mac? | 534           # TODO(ajwong): Why isn't this true in mac? | 
| 531           yasm_flags += [ "-DPIC" ] | 535           yasm_flags += [ "-DPIC" ] | 
| 532         } | 536         } | 
| 533       } | 537       } | 
| 534     } | 538     } | 
| 535   } | 539   } | 
| 536 } | 540 } | 
| OLD | NEW | 
|---|