| 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 } |
| 11 | 11 |
| 12 config("base_implementation") { | 12 config("base_implementation") { |
| 13 defines = [ "BASE_IMPLEMENTATION" ] | 13 defines = [ "BASE_IMPLEMENTATION" ] |
| 14 |
| 15 if (is_ios) { |
| 16 # base uses routines deprecated in iOS 8 |
| 17 cflags = [ "-Wno-deprecated-declarations" ] |
| 18 } |
| 14 } | 19 } |
| 15 | 20 |
| 16 if (is_win) { | 21 if (is_win) { |
| 17 # This is in a separate config so the flags can be applied to dependents. | 22 # This is in a separate config so the flags can be applied to dependents. |
| 18 # ldflags in GN aren't automatically inherited. | 23 # ldflags in GN aren't automatically inherited. |
| 19 config("base_win_linker_flags") { | 24 config("base_win_linker_flags") { |
| 20 ldflags = [ | 25 ldflags = [ |
| 21 "/DELAYLOAD:cfgmgr32.dll", | 26 "/DELAYLOAD:cfgmgr32.dll", |
| 22 "/DELAYLOAD:powrprof.dll", | 27 "/DELAYLOAD:powrprof.dll", |
| 23 "/DELAYLOAD:setupapi.dll", | 28 "/DELAYLOAD:setupapi.dll", |
| (...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 681 "sys_info_linux.cc", | 686 "sys_info_linux.cc", |
| 682 ] | 687 ] |
| 683 set_sources_assignment_filter(sources_assignment_filter) | 688 set_sources_assignment_filter(sources_assignment_filter) |
| 684 | 689 |
| 685 deps += [ | 690 deps += [ |
| 686 ":base_jni_headers", | 691 ":base_jni_headers", |
| 687 "//third_party/android_tools:cpu_features", | 692 "//third_party/android_tools:cpu_features", |
| 688 "//third_party/ashmem", | 693 "//third_party/ashmem", |
| 689 ] | 694 ] |
| 690 | 695 |
| 696 defines = [ "ANDROID_LOG_TAG=$android_log_tag" ] |
| 697 |
| 691 # logging.cc uses the Android logging library. | 698 # logging.cc uses the Android logging library. |
| 692 libs = [ "log" ] | 699 libs = [ "log" ] |
| 693 } | 700 } |
| 694 | 701 |
| 695 if (is_nacl) { | 702 if (is_nacl) { |
| 696 # We reset sources_assignment_filter in order to explicitly include | 703 # We reset sources_assignment_filter in order to explicitly include |
| 697 # the linux file (which would otherwise be filtered out). | 704 # the linux file (which would otherwise be filtered out). |
| 698 set_sources_assignment_filter([]) | 705 set_sources_assignment_filter([]) |
| 699 sources += [ | 706 sources += [ |
| 700 "files/file_path_watcher_stub.cc", | 707 "files/file_path_watcher_stub.cc", |
| (...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1608 | 1615 |
| 1609 # GYP: //base.gyp:base_java_unittest_support | 1616 # GYP: //base.gyp:base_java_unittest_support |
| 1610 android_library("base_java_unittest_support") { | 1617 android_library("base_java_unittest_support") { |
| 1611 deps = [ | 1618 deps = [ |
| 1612 ":base_java", | 1619 ":base_java", |
| 1613 ] | 1620 ] |
| 1614 java_files = | 1621 java_files = |
| 1615 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 1622 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 1616 } | 1623 } |
| 1617 } | 1624 } |
| OLD | NEW |