| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 | 7 |
| 8 if (is_android) { | 8 if (is_android) { |
| 9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
| 10 } | 10 } |
| (...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 deps += [ "//third_party/libevent" ] | 763 deps += [ "//third_party/libevent" ] |
| 764 } | 764 } |
| 765 | 765 |
| 766 # Mac. | 766 # Mac. |
| 767 if (is_mac) { | 767 if (is_mac) { |
| 768 sources -= [ | 768 sources -= [ |
| 769 "native_library_posix.cc", | 769 "native_library_posix.cc", |
| 770 "strings/sys_string_conversions_posix.cc", | 770 "strings/sys_string_conversions_posix.cc", |
| 771 "threading/platform_thread_internal_posix.cc", | 771 "threading/platform_thread_internal_posix.cc", |
| 772 ] | 772 ] |
| 773 |
| 774 # We build with a 10.9 min sdk version but lots of code in this directory is |
| 775 # written to target a 10.6 min sdk version and thus depends on declarations |
| 776 # marked as deprecated on 10.9+. Suppress these warnings for now. |
| 777 cflags = [ "-Wno-deprecated-declarations" ] |
| 773 } else { | 778 } else { |
| 774 # Non-Mac. | 779 # Non-Mac. |
| 775 sources -= [ | 780 sources -= [ |
| 776 "files/file_path_watcher_fsevents.cc", | 781 "files/file_path_watcher_fsevents.cc", |
| 777 "files/file_path_watcher_fsevents.h", | 782 "files/file_path_watcher_fsevents.h", |
| 778 "files/file_path_watcher_kqueue.cc", | 783 "files/file_path_watcher_kqueue.cc", |
| 779 "files/file_path_watcher_kqueue.h", | 784 "files/file_path_watcher_kqueue.h", |
| 780 ] | 785 ] |
| 781 } | 786 } |
| 782 | 787 |
| (...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1511 | 1516 |
| 1512 # GYP: //base.gyp:base_java_unittest_support | 1517 # GYP: //base.gyp:base_java_unittest_support |
| 1513 android_library("base_java_unittest_support") { | 1518 android_library("base_java_unittest_support") { |
| 1514 deps = [ | 1519 deps = [ |
| 1515 ":base_java", | 1520 ":base_java", |
| 1516 ] | 1521 ] |
| 1517 java_files = | 1522 java_files = |
| 1518 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 1523 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 1519 } | 1524 } |
| 1520 } | 1525 } |
| OLD | NEW |