| OLD | NEW | 
|---|
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 
| 2 # | 2 # | 
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license | 
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source | 
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found | 
| 6 # in the file PATENTS.  All contributing project authors may | 6 # in the file PATENTS.  All contributing project authors may | 
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. | 
| 8 | 8 | 
| 9 import("../build/webrtc.gni") | 9 import("../build/webrtc.gni") | 
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") | 
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 51   ] | 51   ] | 
| 52 | 52 | 
| 53   if (is_clang) { | 53   if (is_clang) { | 
| 54     # Suppress warnings from Chrome's Clang plugins. | 54     # Suppress warnings from Chrome's Clang plugins. | 
| 55     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 55     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 56     configs -= [ "//build/config/clang:find_bad_constructs" ] | 56     configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| 57   } | 57   } | 
| 58 | 58 | 
| 59   deps = [ | 59   deps = [ | 
| 60     "..:webrtc_common", | 60     "..:webrtc_common", | 
|  | 61     "../base:rtc_task_queue", | 
| 61     "../system_wrappers", | 62     "../system_wrappers", | 
| 62   ] | 63   ] | 
| 63 | 64 | 
| 64   if (rtc_build_libyuv) { | 65   if (rtc_build_libyuv) { | 
| 65     deps += [ "$rtc_libyuv_dir" ] | 66     deps += [ "$rtc_libyuv_dir" ] | 
| 66     public_deps = [ | 67     public_deps = [ | 
| 67       "$rtc_libyuv_dir", | 68       "$rtc_libyuv_dir", | 
| 68     ] | 69     ] | 
| 69   } else { | 70   } else { | 
| 70     # Need to add a directory normally exported by libyuv. | 71     # Need to add a directory normally exported by libyuv. | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 119       deps += [ "//testing/android/native_test:native_test_support" ] | 120       deps += [ "//testing/android/native_test:native_test_support" ] | 
| 120 | 121 | 
| 121       # This needs to be kept in sync with the .isolate file. | 122       # This needs to be kept in sync with the .isolate file. | 
| 122       # TODO(kjellander); Move this to android_assets targets instead. | 123       # TODO(kjellander); Move this to android_assets targets instead. | 
| 123       data = [ | 124       data = [ | 
| 124         "//resources/foreman_cif.yuv", | 125         "//resources/foreman_cif.yuv", | 
| 125       ] | 126       ] | 
| 126     } | 127     } | 
| 127   } | 128   } | 
| 128 } | 129 } | 
| OLD | NEW | 
|---|