| 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 "media_file_checker.cc", | 232 "media_file_checker.cc", |
| 233 "media_file_checker.h", | 233 "media_file_checker.h", |
| 234 ] | 234 ] |
| 235 } | 235 } |
| 236 | 236 |
| 237 deps += [ "//third_party/ffmpeg" ] | 237 deps += [ "//third_party/ffmpeg" ] |
| 238 } | 238 } |
| 239 | 239 |
| 240 if (enable_browser_cdms) { | 240 if (enable_browser_cdms) { |
| 241 sources += [ | 241 sources += [ |
| 242 "browser_cdm.cc", | |
| 243 "browser_cdm.h", | |
| 244 "browser_cdm_factory.cc", | 242 "browser_cdm_factory.cc", |
| 245 "browser_cdm_factory.h", | 243 "browser_cdm_factory.h", |
| 246 ] | 244 ] |
| 247 } | 245 } |
| 248 | 246 |
| 249 if (is_android) { | 247 if (is_android) { |
| 250 public_deps = [ | 248 public_deps = [ |
| 251 "//media/base/android", | 249 "//media/base/android", |
| 252 "//media/base/android:media_java", | 250 "//media/base/android:media_java", |
| 253 "//media/base/android:media_jni_headers", | 251 "//media/base/android:media_jni_headers", |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 if (is_posix) { | 538 if (is_posix) { |
| 541 yasm_flags += [ "-DELF" ] | 539 yasm_flags += [ "-DELF" ] |
| 542 if (current_cpu == "x64") { | 540 if (current_cpu == "x64") { |
| 543 # TODO(ajwong): Why isn't this true in mac? | 541 # TODO(ajwong): Why isn't this true in mac? |
| 544 yasm_flags += [ "-DPIC" ] | 542 yasm_flags += [ "-DPIC" ] |
| 545 } | 543 } |
| 546 } | 544 } |
| 547 } | 545 } |
| 548 } | 546 } |
| 549 } | 547 } |
| OLD | NEW |