Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: base/BUILD.gn

Issue 1855483004: [iOS/OS X] Allow base::scoped_nsobject<> to be used when ARC is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes to build/config/compiler/BUILD.gn Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | base/base.gyp » ('j') | base/mac/scoped_block.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 # HOW TO WRITE CONDITIONALS IN THIS FILE 5 # HOW TO WRITE CONDITIONALS IN THIS FILE
6 # ====================================== 6 # ======================================
7 # 7 #
8 # In many other places, one would write a conditional that expresses all the 8 # In many other places, one would write a conditional that expresses all the
9 # cases when a source file is used or unused, and then either add or subtract 9 # cases when a source file is used or unused, and then either add or subtract
10 # it from the sources list in that case 10 # it from the sources list in that case
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 "mac/mach_port_broker.mm", 422 "mac/mach_port_broker.mm",
423 "mac/mach_port_util.cc", 423 "mac/mach_port_util.cc",
424 "mac/mach_port_util.h", 424 "mac/mach_port_util.h",
425 "mac/objc_property_releaser.h", 425 "mac/objc_property_releaser.h",
426 "mac/objc_property_releaser.mm", 426 "mac/objc_property_releaser.mm",
427 "mac/os_crash_dumps.cc", 427 "mac/os_crash_dumps.cc",
428 "mac/os_crash_dumps.h", 428 "mac/os_crash_dumps.h",
429 "mac/scoped_aedesc.h", 429 "mac/scoped_aedesc.h",
430 "mac/scoped_authorizationref.h", 430 "mac/scoped_authorizationref.h",
431 "mac/scoped_block.h", 431 "mac/scoped_block.h",
432 "mac/scoped_block.mm",
432 "mac/scoped_cftyperef.h", 433 "mac/scoped_cftyperef.h",
433 "mac/scoped_ioobject.h", 434 "mac/scoped_ioobject.h",
434 "mac/scoped_ioplugininterface.h", 435 "mac/scoped_ioplugininterface.h",
435 "mac/scoped_launch_data.h", 436 "mac/scoped_launch_data.h",
436 "mac/scoped_mach_port.cc", 437 "mac/scoped_mach_port.cc",
437 "mac/scoped_mach_port.h", 438 "mac/scoped_mach_port.h",
438 "mac/scoped_mach_vm.cc", 439 "mac/scoped_mach_vm.cc",
439 "mac/scoped_mach_vm.h", 440 "mac/scoped_mach_vm.h",
440 "mac/scoped_nsautorelease_pool.h", 441 "mac/scoped_nsautorelease_pool.h",
441 "mac/scoped_nsautorelease_pool.mm", 442 "mac/scoped_nsautorelease_pool.mm",
442 "mac/scoped_nsobject.h", 443 "mac/scoped_nsobject.h",
444 "mac/scoped_nsobject.mm",
443 "mac/scoped_objc_class_swizzler.h", 445 "mac/scoped_objc_class_swizzler.h",
444 "mac/scoped_objc_class_swizzler.mm", 446 "mac/scoped_objc_class_swizzler.mm",
445 "mac/scoped_sending_event.h", 447 "mac/scoped_sending_event.h",
446 "mac/scoped_sending_event.mm", 448 "mac/scoped_sending_event.mm",
447 "mac/sdk_forward_declarations.h", 449 "mac/sdk_forward_declarations.h",
448 "mac/sdk_forward_declarations.mm", 450 "mac/sdk_forward_declarations.mm",
449 "macros.h", 451 "macros.h",
450 "md5.cc", 452 "md5.cc",
451 "md5.h", 453 "md5.h",
452 "memory/aligned_memory.cc", 454 "memory/aligned_memory.cc",
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 "mac/call_with_eh_frame.cc", 1387 "mac/call_with_eh_frame.cc",
1386 "mac/call_with_eh_frame.h", 1388 "mac/call_with_eh_frame.h",
1387 "mac/foundation_util.h", 1389 "mac/foundation_util.h",
1388 "mac/foundation_util.mm", 1390 "mac/foundation_util.mm",
1389 "mac/mac_logging.h", 1391 "mac/mac_logging.h",
1390 "mac/mac_logging.mm", 1392 "mac/mac_logging.mm",
1391 "mac/mach_logging.cc", 1393 "mac/mach_logging.cc",
1392 "mac/mach_logging.h", 1394 "mac/mach_logging.h",
1393 "mac/objc_property_releaser.h", 1395 "mac/objc_property_releaser.h",
1394 "mac/objc_property_releaser.mm", 1396 "mac/objc_property_releaser.mm",
1397 "mac/scoped_block.h",
1398 "mac/scoped_block.mm",
1395 "mac/scoped_mach_port.cc", 1399 "mac/scoped_mach_port.cc",
1396 "mac/scoped_mach_port.h", 1400 "mac/scoped_mach_port.h",
1397 "mac/scoped_mach_vm.cc", 1401 "mac/scoped_mach_vm.cc",
1398 "mac/scoped_mach_vm.h", 1402 "mac/scoped_mach_vm.h",
1399 "mac/scoped_nsautorelease_pool.h", 1403 "mac/scoped_nsautorelease_pool.h",
1400 "mac/scoped_nsautorelease_pool.mm", 1404 "mac/scoped_nsautorelease_pool.mm",
1401 "mac/scoped_nsobject.h", 1405 "mac/scoped_nsobject.h",
1406 "mac/scoped_nsobject.mm",
1402 "mac/scoped_objc_class_swizzler.h", 1407 "mac/scoped_objc_class_swizzler.h",
1403 "mac/scoped_objc_class_swizzler.mm", 1408 "mac/scoped_objc_class_swizzler.mm",
1409 "mac/scoped_typeref.h",
1404 "memory/shared_memory_posix.cc", 1410 "memory/shared_memory_posix.cc",
1405 "message_loop/message_pump_mac.h", 1411 "message_loop/message_pump_mac.h",
1406 "message_loop/message_pump_mac.mm", 1412 "message_loop/message_pump_mac.mm",
1407 "process/memory_stubs.cc", 1413 "process/memory_stubs.cc",
1408 "strings/sys_string_conversions_mac.mm", 1414 "strings/sys_string_conversions_mac.mm",
1409 "threading/platform_thread_mac.mm", 1415 "threading/platform_thread_mac.mm",
1410 "time/time_mac.cc", 1416 "time/time_mac.cc",
1411 ] 1417 ]
1412 1418
1413 set_sources_assignment_filter(sources_assignment_filter) 1419 set_sources_assignment_filter(sources_assignment_filter)
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
1643 testonly = true 1649 testonly = true
1644 sources = [ 1650 sources = [
1645 "test/data", 1651 "test/data",
1646 ] 1652 ]
1647 outputs = [ 1653 outputs = [
1648 "{{bundle_resources_dir}}/" + 1654 "{{bundle_resources_dir}}/" +
1649 "{{source_root_relative_dir}}/{{source_file_part}}", 1655 "{{source_root_relative_dir}}/{{source_file_part}}",
1650 ] 1656 ]
1651 } 1657 }
1652 1658
1659 if (is_ios || is_mac) {
1660 source_set("base_unittests_arc") {
1661 testonly = true
1662 set_sources_assignment_filter([])
1663 sources = [
1664 "mac/scoped_nsobject_unittest_arc.mm",
1665 ]
1666 set_sources_assignment_filter(sources_assignment_filter)
1667 configs += [ "//build/config/compiler:enable_arc" ]
1668 deps = [
1669 ":base",
1670 "//testing/gtest",
1671 ]
1672 }
1673 }
1674
1653 test("base_unittests") { 1675 test("base_unittests") {
1654 sources = [ 1676 sources = [
1655 "allocator/tcmalloc_unittest.cc", 1677 "allocator/tcmalloc_unittest.cc",
1656 "android/application_status_listener_unittest.cc", 1678 "android/application_status_listener_unittest.cc",
1657 "android/content_uri_utils_unittest.cc", 1679 "android/content_uri_utils_unittest.cc",
1658 "android/jni_android_unittest.cc", 1680 "android/jni_android_unittest.cc",
1659 "android/jni_array_unittest.cc", 1681 "android/jni_array_unittest.cc",
1660 "android/jni_string_unittest.cc", 1682 "android/jni_string_unittest.cc",
1661 "android/library_loader/library_prefetcher_unittest.cc", 1683 "android/library_loader/library_prefetcher_unittest.cc",
1662 "android/path_utils_unittest.cc", 1684 "android/path_utils_unittest.cc",
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
1913 ":i18n", 1935 ":i18n",
1914 ":message_loop_tests", 1936 ":message_loop_tests",
1915 "//base/test:run_all_unittests", 1937 "//base/test:run_all_unittests",
1916 "//base/test:test_support", 1938 "//base/test:test_support",
1917 "//base/third_party/dynamic_annotations", 1939 "//base/third_party/dynamic_annotations",
1918 "//testing/gmock", 1940 "//testing/gmock",
1919 "//testing/gtest", 1941 "//testing/gtest",
1920 "//third_party/icu", 1942 "//third_party/icu",
1921 ] 1943 ]
1922 1944
1945 if (is_ios || is_mac) {
1946 deps += [ ":base_unittests_arc" ]
1947 }
1948
1923 public_deps = [ 1949 public_deps = [
1924 ":base_unittests_bundle_data", 1950 ":base_unittests_bundle_data",
1925 ] 1951 ]
1926 1952
1927 # Some unittests depend on the ALLOCATOR_SHIM macro. 1953 # Some unittests depend on the ALLOCATOR_SHIM macro.
1928 configs += [ "//base/allocator:allocator_shim_define" ] 1954 configs += [ "//base/allocator:allocator_shim_define" ]
1929 1955
1930 data = [ 1956 data = [
1931 "test/data/", 1957 "test/data/",
1932 ] 1958 ]
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
2329 2355
2330 # GYP: //base.gyp:base_java_unittest_support 2356 # GYP: //base.gyp:base_java_unittest_support
2331 android_library("base_java_unittest_support") { 2357 android_library("base_java_unittest_support") {
2332 deps = [ 2358 deps = [
2333 ":base_java", 2359 ":base_java",
2334 ] 2360 ]
2335 java_files = 2361 java_files =
2336 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 2362 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
2337 } 2363 }
2338 } 2364 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gyp » ('j') | base/mac/scoped_block.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698