diff options
| -rw-r--r-- | BUILD.gn | 429 | ||||
| -rw-r--r-- | build/all.gyp | 151 | ||||
| -rw-r--r-- | build/secondary/tools/grit/grit_rule.gni | 6 | ||||
| -rw-r--r-- | chrome/test/BUILD.gn | 13 | ||||
| -rw-r--r-- | components/pdf/renderer/BUILD.gn | 1 | ||||
| -rw-r--r-- | third_party/libaddressinput/BUILD.gn | 13 | ||||
| -rw-r--r-- | third_party/libexif/BUILD.gn | 15 |
7 files changed, 237 insertions, 391 deletions
@@ -10,7 +10,6 @@ import("//build/config/features.gni") import("//build/config/ui.gni") - if (is_android) { import("//build/config/android/config.gni") } @@ -22,119 +21,127 @@ declare_args() { root_extra_deps = [] } -group("gyp_all") { - testonly = true - - # TODO(GYP): This target should describe everything that is built by a GYP - # build but not yet by a GN build, i.e., these are the targets that still - # need to be ported to GN. Eventually this target should be identical to - # gn_all. - - deps = [ - ":gn_all", - # "//chrome/test:chromedriver_unittests", # TODO(GYP) - # "//components:components_browsertests", # TODO(GYP) - # "//components/nacl:nacl_loader_unittests", # TODO(GYP) - # "//google_apis:google_apis_unittests", # TODO(GYP) - # "//ui/compositor:compositor_unittests", # TODO(GYP) - # "//device:device_unittests", # TODO(GYP) - # "//ppapi:ppapi_unittests", # TODO(GYP) - # "//remoting:remoting_unittests", # TODO(GYP) - ] -} - -# The "gn_all" target matches the "gn_all" target in build/all.gyp. -# It is not (yet!) the same as building "all". -# TODO(GYP): Make it be basically the same as building all, or at least -# be sure that we don't want any of the stuff listed in gn_all to -# be built by default. - # In GN, a "group" is a dummy target that just lists other targets. -group("gn_all") { +group("root") { + # This should not be linked into production and depends on test targets. testonly = true + # Note that some dependencies are commented out. These are things that are + # currently written but not hooked up to the build yet. They may need to be + # completed or possibly just tested and then re-enabled. deps = [ - "//base:base_unittests", - "//cc:cc_unittests", - "//chrome", - "//chrome/test:browser_tests", - "//chrome/test:interactive_ui_tests", - "//chrome/test:sync_integration_tests", - "//chrome/test:unit_tests", - "//components:components_unittests", + "//apps", + "//ash", + "//cc", + "//cc/blink", + "//chrome/browser", + "//chrome/browser/devtools", + "//chrome/common", + "//chrome/plugin", + "//chrome/renderer", + "//chrome/test", + "//chrome/tools", + "//chrome/utility", + "//components:all_components", + "//content", "//content/shell:content_shell", - "//content/test:content_browsertests", - "//content/test:content_perftests", - "//content/test:content_unittests", - "//crypto:crypto_unittests", - "//extensions:extensions_browsertests", - "//extensions:extensions_unittests", - "//google_apis/gcm:gcm_unit_tests", - "//gpu:gpu_unittests", - "//ipc:ipc_tests", - "//ipc/mojo:ipc_mojo_unittests", - "//jingle:jingle_unittests", - "//media:media_unittests", - "//media/mojo", # only builds in mojo - "//media/cast:cast_unittests", + "//content/test:test_support", + "//crypto", + "//device/battery", + "//device/bluetooth", + "//device/nfc", + "//device/vibration", + "//extensions/browser", + "//extensions/common", + "//extensions/common/api", + "//extensions/renderer", + "//gin", + "//gpu", + "//google_apis", + "//google_apis/gcm", + "//ipc", + "//ipc/mojo", + "//jingle:notifier", + "//media", + "//media/blink", + "//media/cast", + "//media/mojo", "//mojo", - "//mojo/common:mojo_common_unittests", - - # "//mojo/services/html_viewer:tests", # TODO(GYP): Do we need this? - "//net:net_unittests", - "//ppapi/examples", # TODO(GYP): What's the GYP equivalent? - "//printing:printing_unittests", - "//skia:skia_unittests", - "//sql:sql_unittests", - "//sync:sync_unit_tests", - - # TODO(GYP): the Blink test targets should be public, but - # currently aren't. all_blink pulls them in, though. - # "//third_party/WebKit/Source/platform:heap_unittests", - # "//third_party/WebKit/Source/platform:platform_unittests", - # "//third_party/WebKit/Source/wtf:wtf_unittests", + "//net", + "//pdf", + "//ppapi/examples", + "//printing", + "//remoting/client/plugin", + "//sandbox", + "//sdch", + "//skia", + "//storage/browser", + "//sql", + "//sync", "//third_party/WebKit/public:all_blink", - "//third_party/cacheinvalidation:cacheinvalidation_unittests", - - # TODO(GYP): This is needed only w/ cld_version==1. What configs set that? + "//third_party/angle:translator", + "//third_party/brotli", + "//third_party/cacheinvalidation", "//third_party/cld", + "//third_party/cld_2", "//third_party/codesighs", - - # TODO(GYP): This is needed only w/ use_system_fontconfig==0. - # What configs set that? - # "//third_party/fontconfig", - - # TODO(GYP): This will be pulled in automatically when enable_webrtc==true. - # For now pull it in manually so that it doesn't regress. + "//third_party/ffmpeg", + "//third_party/flac", + "//third_party/harfbuzz-ng", + "//third_party/hunspell", + "//third_party/iccjpeg", + "//third_party/icu", + "//third_party/leveldatabase", + "//third_party/libphonenumber", + "//third_party/libjingle", + "//third_party/libpng", "//third_party/libsrtp", - "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests", - "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests", - "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests", - "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", - "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", - "//third_party/pdfium/samples:pdfium_test", - - # TODO(GYP): Verify that this is no longer needed. + "//third_party/libusb", + "//third_party/libwebp", + "//third_party/libxslt", + "//third_party/libvpx", + "//third_party/libyuv", + "//third_party/lzma_sdk", + "//third_party/mesa", + "//third_party/opus", + "//third_party/ots", + "//third_party/protobuf:protobuf_lite", + "//third_party/qcms", + "//third_party/re2", + "//third_party/smhasher:cityhash", + "//third_party/smhasher:murmurhash3", "//third_party/smhasher:pmurhash", - - # TODO(GYP): This will be pulled in automatically when enable_webrtc==true. - # For now pull it in manually so that it doesn't regress. + "//third_party/snappy", + "//third_party/speex", "//third_party/usrsctp", - "//tools/imagediff($host_toolchain)", + "//third_party/widevine/cdm:version_h", + "//third_party/webrtc", + "//third_party/zlib", + "//third_party:jpeg", "//tools/gn", - "//tools/gn:gn_unittests", - "//tools/telemetry:bitmaptools($host_toolchain)", - "//ui/accessibility:accessibility_unittests", - "//ui/app_list:app_list_unittests", - "//ui/base:ui_base_unittests", - "//ui/display:display_unittests", - "//ui/events:events_unittests", - "//ui/gfx:gfx_unittests", - "//ui/touch_selection:ui_touch_selection_unittests", - "//ui/views:views_unittests", - "//url:url_unittests", + "//tools/imagediff($host_toolchain)", + "//tools/telemetry:bitmaptools", + "//ui/accessibility", + "//ui/app_list", + "//ui/aura", + "//ui/base", + "//ui/display", + "//ui/events", + "//ui/gfx", + "//ui/gl", + "//ui/keyboard", + "//ui/native_theme", + "//ui/resources", + "//ui/snapshot", + "//ui/strings", + "//ui/surface", + "//ui/touch_selection", + "//ui/views", + "//ui/views/controls/webview", + "//ui/web_dialogs", + "//url", + "//v8:v8", ] - deps += root_extra_deps # TODO(GYP): Get this working on the mac? @@ -146,154 +153,166 @@ group("gn_all") { deps += [ "//breakpad:symupload" ] } + if (is_linux) { + deps += [ + "//dbus", + "//third_party/fontconfig", + "//third_party/freetype2", + ] + } + if (use_x11) { deps += [ "//tools/xdisplaycheck" ] } if (use_aura) { - deps += [ "//ui/wm:wm_unittests" ] + deps += [ "//ui/wm" ] } - if (use_ozone) { - deps += [ - "//ui/ozone", # TODO(GYP) Needed?? - "//ui/ozone/demo", # TODO(GYP) Needed?? - ] + if (is_win) { + deps += [ "//ui/metro_viewer" ] } if (is_win || is_mac || is_chromeos) { # RLZ works on these platforms. - # TODO(GYP): Is this target needed, or pulled in automatically? deps += [ "//rlz:rlz_lib" ] } + if (current_cpu == "x86" || current_cpu == "x64") { + # YASM is x86/x64 only. + deps += [ "//third_party/yasm($host_toolchain)" ] + } + if (is_android) { deps += [ "//base/android/linker:chromium_android_linker", "//build/android/gyp/test:hello_world", "//build/android/rezip", + "//third_party/openmax_dl/dl", + "//content/shell/android:content_shell_apk", "//chrome/android:chrome_shell_apk", + "//chrome/test:test_support_unit", "//chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk", - "//tools/imagediff($host_toolchain)", - - # TODO(GYP): Remove these when the components_unittests work. - "//components/history/core/test:test", - "//components/policy:policy_component_test_support", - "//components/policy:test_support", - "//components/rappor:test_support", - "//components/signin/core/browser:test_support", - "//components/sync_driver:test_support", - "//components/user_manager", - "//components/wallpaper", - "//content/shell/android:content_shell_apk", - - # TODO(GYP): Are these needed, or will they be pulled in automatically? + "//ui/android:ui_java", "//third_party/android_tools:android_gcm_java", "//third_party/android_tools:uiautomator_java", "//third_party/android_tools:android_support_v13_java", "//third_party/android_tools:android_support_v7_appcompat_java", "//third_party/android_tools:android_support_v7_mediarouter_java", - "//third_party/mesa", "//third_party/mockito:mockito_java", - "//third_party/openmax_dl/dl", - "//third_party/speex", - "//ui/android:ui_java", - - # TODO(GYP): Are these needed? - "//chrome/test:test_support_unit", - "//third_party/smhasher:murmurhash3", - "//ui/message_center:test_support", ] + + if (has_chrome_android_internal) { + deps += [ "//clank" ] + } + + # TODO(GYP): Move the targets in the rest of this block that still + # need to be made to work in the GN build to the bottom of the file + # so that all the remaining work is located in one place in the file. + # This block should contain only the targets that aren't actually + # needed on Android. + deps -= [ - "//breakpad:symupload", # TODO(GYP) ?? - "//chrome", # TODO(GYP) ?? - "//chrome/test:browser_tests", # TODO(GYP) ?? - "//chrome/test:interactive_ui_tests", # TODO(GYP) ?? - "//chrome/test:sync_integration_tests", # TODO(GYP) ?? - "//chrome/test:unit_tests", # TODO(GYP) - "//extensions:extensions_browsertests", - "//extensions:extensions_unittests", - "//google_apis/gcm:gcm_unit_tests", - "//ipc:ipc_tests", # TODO(GYP) ?? - "//jingle:jingle_unittests", # TODO(GYP) ?? - "//net:net_unittests", + "//apps", # Needs testing. + "//chrome/browser", + "//chrome/browser/devtools", + "//chrome/common", + "//chrome/plugin", + "//chrome/renderer", + "//chrome/test", + "//chrome/tools", + "//chrome/utility", + "//content/shell:content_shell", + "//extensions/browser", + "//extensions/common", + "//extensions/common/api", + "//extensions/renderer", + "//pdf", # Not compiled on Android in GYP yet, either. "//ppapi/examples", - "//third_party/pdfium/samples:pdfium_test", + "//third_party/libusb", + "//ui/keyboard", # Blocked on content. + + # Seems to not be compiled on Android. Otherwise it will need a config.h. + "//third_party/libxslt", + + # Not relevant to Android. + "//ash", "//tools/gn", - "//tools/gn:gn_unittests", - "//ui/app_list:app_list_unittests", - "//ui/views:views_unittests", - "//url:url_unittests", + "//ui/aura", + "//ui/display", + "//ui/views", + "//ui/views/controls/webview", + + # Fails on Android for unknown reasons. + "//third_party/flac", + "//breakpad:symupload", + + # Not tested on Android yet: + "//google_apis/gcm", + "//remoting/client/plugin", + "//storage/browser", + "//third_party/cld_2", + "//third_party/ffmpeg", + "//ui/app_list", + "//ui/web_dialogs", ] + } - if (has_chrome_android_internal) { - deps += [ "//clank" ] # TODO(GYP) ?? - } - } else if (is_linux) { + if (use_ozone) { deps += [ - "//dbus:dbus_unittests", - "//sandbox/linux:sandbox_linux_unittests", + "//ui/ozone", + "//ui/ozone/demo", ] - } else if (is_mac) { + } + + # Non-mobile builds. + if (!is_android && !is_ios) { deps += [ - "//third_party/apple_sample_code", - "//third_party/molokocacao", + "//device/usb", + "//device:device_unittests", + "//third_party/pdfium/samples", ] + } - # TODO(GYP): Remove these when the targets below work and these - # are pulled in automatically. + # + # TODO(GYP): Make everything below this work in the GN build. + # + + if (is_mac) { deps += [ - "//cc/blink", - "//components/ui/zoom:ui_zoom", - "//content", - "//content/test:test_support", - "//device/battery", - "//device/bluetooth", - "//device/nfc", - "//device/usb", - "//device/vibration", - "//media/blink", - "//pdf", - "//storage/browser", - "//third_party/brotli", - "//third_party/flac", - "//third_party/hunspell", - "//third_party/iccjpeg", - "//third_party/libphonenumber", - "//third_party/ots", - "//third_party/qcms", - "//third_party/smhasher:murmurhash3", - "//third_party/speex", - "//third_party/webrtc/system_wrappers", - "//ui/native_theme", - "//ui/snapshot", - "//ui/surface", + "//third_party/apple_sample_code", + "//third_party/molokocacao", ] # TODO(dpranke): These are as-yet untriaged but need at least the above. deps -= [ - "//chrome", # TODO(GYP) - "//chrome/test:browser_tests", # TODO(GYP) - "//chrome/test:interactive_ui_tests", # TODO(GYP) - "//chrome/test:sync_integration_tests", # TODO(GYP) - "//chrome/test:unit_tests", # TODO(GYP) - "//components:components_unittests", # TODO(GYP) - "//content/test:content_browsertests", # TODO(GYP) - "//content/test:content_perftests", # TODO(GYP) - "//content/test:content_unittests", # TODO(GYP) - "//extensions:extensions_browsertests", # TODO(GYP) - "//extensions:extensions_unittests", # TODO(GYP) - "//net:net_unittests", # TODO(GYP) - "//third_party/usrsctp", # TODO(GYP) - "//ui/app_list:app_list_unittests", # TODO(GYP) - "//ui/gfx:gfx_unittests", # TODO(GYP) - "//ui/views:views_unittests", # TODO(GYP) - ] - } else if (is_win) { - deps += [ "//ui/metro_viewer" ] - deps -= [ - "//crypto:crypto_unittests", # TODO(GYP) - "//net:net_unittests", # TODO(GYP) + "//apps", + "//ash", + "//chrome/browser", + "//chrome/browser/devtools", + "//chrome/common", + "//chrome/plugin", + "//chrome/renderer", + "//chrome/test", + "//chrome/utility", + "//components:all_components", + "//content/shell:content_shell", + "//extensions/browser", + "//extensions/common", + "//extensions/common/api", + "//extensions/renderer", + "//remoting/client/plugin", + "//third_party/usrsctp", + "//ui/app_list", + "//ui/aura", + "//ui/keyboard", + "//ui/views", + "//ui/views/controls/webview", + "//ui/web_dialogs", ] } + + if (is_mac || is_ios) { + deps -= [ "//ui/touch_selection" ] + } } diff --git a/build/all.gyp b/build/all.gyp index fe83285..8ad63b3 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -467,158 +467,9 @@ }, # target_name: chromium_builder_tests ], 'conditions': [ - # TODO(GYP) - make gyp_all and gn_all work on iOS and Android also. - ['OS!="ios" and OS!="android"', { + ['OS!="ios"', { 'targets': [ { - 'target_name': 'gyp_all', - 'type': 'none', - 'dependencies': [ - ':gn_all', - '../chrome/chrome.gyp:chromedriver_unittests', - '../components/components_tests.gyp:components_browsertests', - # '../components/nacl.gyp:nacl_loader_unittests', # TODO(GYP) - # '../remoting/remoting.gyp:remoting_unittests', # TODO(GYP) - '../ui/compositor/compositor.gyp:compositor_unittests', - ], - 'conditions': [ - ['OS!="android"', { - 'dependencies': [ - # '../device/device_tests.gyp:device_unittests', # TODO(GYP) - # '../google_apis/google_apis.gyp:google_apis_unittests', # TODO(GYP) - ], - }], - ], - }, - { - 'target_name': 'gn_all', - 'type': 'none', - - 'dependencies': [ - '../base/base.gyp:base_unittests', - '../cc/cc_tests.gyp:cc_unittests', - '../chrome/chrome.gyp:chrome', - '../chrome/chrome.gyp:browser_tests', - '../chrome/chrome.gyp:interactive_ui_tests', - '../chrome/chrome.gyp:sync_integration_tests', - '../chrome/chrome.gyp:unit_tests', - '../components/components_tests.gyp:components_unittests', - '../content/content_shell_and_tests.gyp:content_shell', - '../content/content_shell_and_tests.gyp:content_browsertests', - '../content/content_shell_and_tests.gyp:content_perftests', - '../content/content_shell_and_tests.gyp:content_unittests', - '../crypto/crypto.gyp:crypto_unittests', - '../extensions/extensions_tests.gyp:extensions_browsertests', - '../extensions/extensions_tests.gyp:extensions_unittests', - '../google_apis/gcm/gcm.gyp:gcm_unit_tests', - '../gpu/gpu.gyp:gpu_unittests', - '../ipc/ipc.gyp:ipc_tests', - '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests', - '../jingle/jingle.gyp:jingle_unittests', - '../media/media.gyp:media_unittests', - '../media/cast/cast.gyp:cast_unittests', - '../mojo/mojo.gyp:mojo', - '../mojo/mojo_base.gyp:mojo_common_unittests', - '../net/net.gyp:net_unittests', - '../ppapi/ppapi_internal.gyp:ppapi_tests', - '../printing/printing.gyp:printing_unittests', - '../sql/sql.gyp:sql_unittests', - '../skia/skia_tests.gyp:skia_unittests', - '../sync/sync.gyp:sync_unit_tests', - - # TODO(GYP): the Blink test targets should be public, but - # currently aren't. all_blink puls them in, though - # "//third_party/WebKit/Source/platform:heap_unittests", - # "//third_party/WebKit/Source/platform:platform_unittests", - # "//third_party/WebKit/Source/wtf:wtf_unittests", - '../third_party/WebKit/public/all.gyp:all_blink', - - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', - - # TODO(GYP): Needed only w/ cld_version==1. What configs set that? - '../third_party/cld/cld.gyp:cld', - - # TODO(GYP): This is needed only w/ use_system_fontconfig==0. What configs set that? - #'../third_party/fontconfig/fontconfig.gyp:fontconfig', - - # TODO(GYP): This will be pulled in automatically when enable_webrtc==true. - # For now pull it in manually so that it doesn't regress. - '../third_party/libsrtp/libsrtp.gyp:libsrtp', - - '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests', - '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests', - '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests', - '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests', - '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests', - '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests', - '../third_party/pdfium/samples/samples.gyp:pdfium_test', - - # TODO(GYP): Verify that this is no longer needed. - '../third_party/smhasher/smhasher.gyp:pmurhash', - - # TODO(GYP): This will be pulled in automatically when enable_webrtc==true. - # For now pull it in manually so that it doesn't regress. - '../third_party/usrsctp/usrsctp.gyp:usrsctplib', - - '../tools/gn/gn.gyp:gn', - '../tools/gn/gn.gyp:gn_unittests', - '../tools/imagediff/image_diff.gyp:image_diff#host', - '../ui/accessibility/accessibility.gyp:accessibility_unittests', - '../ui/app_list/app_list.gyp:app_list_unittests', - '../ui/base/ui_base_tests.gyp:ui_base_unittests', - '../ui/display/display.gyp:display_unittests', - '../ui/events/events.gyp:events_unittests', - '../ui/gfx/gfx_tests.gyp:gfx_unittests', - '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests', - '../ui/views/views.gyp:views_unittests', - '../ui/wm/wm.gyp:wm_unittests', - '../url/url.gyp:url_unittests', - ], - 'conditions': [ - ['OS!="win"', { - 'dependencies': [ - '../breakpad/breakpad.gyp:symupload#host', - ], - }], - ['use_x11==1', { - 'dependencies': [ - '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', - ], - }], - ['use_aura==1', { - 'dependencies': [ - '../ui/wm/wm.gyp:wm_unittests', - ], - }], - ['use_ozone==1', { - 'dependencies': [ - '../ui/ozone/ozone.gyp:ozone', - '../ui/ozone/demo.gyp:demo', - ], - }], - ['OS=="win" or OS=="mac" or OS=="android"', { - 'dependencies': [ - '../rlz/rlz.gyp:rlz_lib', - ], - }], - ['OS=="android"', { - 'dependencies': [ - '../chrome/chrome.gyp:chrome_shell_apk', - '../content/content_shell_and_tests.gyp:content_shell_apk', - ], - 'dependencies!': [ - '../url/url.gyp:url_unittests', - ], - }], - ['OS=="linux"', { - 'dependencies': [ - '../dbus/dbus.gyp:dbus_unittests', - '../sandbox/sandbox.gyp:sandbox_linux_unittests', - ], - }], - ], - }, - { 'target_name': 'blink_tests', 'type': 'none', 'dependencies': [ diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni index 626fd74..cdaf0f2 100644 --- a/build/secondary/tools/grit/grit_rule.gni +++ b/build/secondary/tools/grit/grit_rule.gni @@ -53,8 +53,6 @@ # use_qualified_include (optional) # If set, output_dir is not added to include_dirs. # -# configs (optional) -# List of additional configs to be applied to the generated target. # deps (optional) # inputs (optional) # List of additional files, required for grit to process source file. @@ -440,10 +438,6 @@ template("grit") { public_configs += invoker.public_configs } - if (defined(invoker.configs)) { - configs += invoker.configs - } - if (defined(invoker.visibility)) { visibility = invoker.visibility } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index e905563..06b9aff 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -380,7 +380,9 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { } if (is_mac) { - datadeps += [ "//chrome" ] + datadeps = [ + "//chrome", + ] # TODO(mark): We really want this for all non-static library targets, but # when we tried to pull it up to the common.gypi level, it broke other @@ -877,6 +879,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { ] sources += [ "../browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc", + "../browser/renderer_host/chrome_render_widget_host_view_mac_delegate_browsertest.cc", "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm", "../browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc", ] @@ -887,13 +890,11 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { # TODO(rouslan): This test depends on the custom dictionary UI, # which is disabled on Mac. - # TODO(GYP): This should be added somewhere first ... - # "../browser/ui/webui/options/edit_dictionary_browsertest.js", + "../browser/ui/webui/options/edit_dictionary_browsertest.js", # TODO(rouslan): This test depends on hunspell and we cannot run it # on Mac, which does use hunspell by default. - # TODO(GYP): This should be added somewhere first ... - # "../browser/ui/webui/options/language_options_dictionary_download_browsertest.js", + "../browser/ui/webui/options/language_options_dictionary_download_browsertest.js", # ProcessSingletonMac doesn"t do anything. "../browser/process_singleton_browsertest.cc", @@ -1550,7 +1551,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { # on disk so it can pull from it. deps += [ "//third_party/google_toolbox_for_mac", - # "//third_party/ocmock", # TODO(GYP) + "//third_party/ocmock", ] # TODO(mark): We really want this for all non-static library targets, diff --git a/components/pdf/renderer/BUILD.gn b/components/pdf/renderer/BUILD.gn index 591ca02..3a1554e 100644 --- a/components/pdf/renderer/BUILD.gn +++ b/components/pdf/renderer/BUILD.gn @@ -21,7 +21,6 @@ static_library("renderer") { "//base", "//components/pdf/common", "//components/resources:components_resources", - "//components/resources:components_scaled_resources", "//components/strings", "//content/public/renderer", "//gin", diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn index 1307c71..0c92b5b 100644 --- a/third_party/libaddressinput/BUILD.gn +++ b/third_party/libaddressinput/BUILD.gn @@ -24,12 +24,6 @@ libaddressinput_util_files = [ "src/cpp/src/util/string_util.cc", ] -config("no-newline-eof-warning") { - if (is_clang) { - cflags = [ "-Wno-newline-eof" ] - } -} - # GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings grit("strings") { source = "//chrome/app/address_input_strings.grd" @@ -91,8 +85,6 @@ grit("strings") { "address_input_strings_zh-CN.pak", "address_input_strings_zh-TW.pak", ] - - configs = [ ":no-newline-eof-warning" ] } config("libaddressinput_config") { @@ -117,10 +109,7 @@ static_library("util") { sources -= [ "src/cpp/src/util/json.cc" ] configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ - ":no-newline-eof-warning", - "//build/config/compiler:no_chromium_code", - ] + configs += [ "//build/config/compiler:no_chromium_code" ] public_configs = [ ":libaddressinput_config" ] diff --git a/third_party/libexif/BUILD.gn b/third_party/libexif/BUILD.gn index de9b2ef..be8caf6 100644 --- a/third_party/libexif/BUILD.gn +++ b/third_party/libexif/BUILD.gn @@ -4,19 +4,10 @@ # Linux should use system libexif if (!is_linux || is_chromeos) { + # TODO(thestig): Properly support building on Linux. config("libexif_config") { include_dirs = [ "sources" ] - if (is_clang) { - cflags = [ - "-Wno-enum-conversion", - "-Wno-switch", - "-Wno-format", - - # libexif uses fabs(int) to cast to float. - "-Wno-absolute-value", - ] - } } static_library("libexif") { @@ -60,7 +51,9 @@ if (!is_linux || is_chromeos) { ldflags = [ "/DEF:" + rebase_path("libexif.def") ] - cflags = [ "/wd4018" ] # size/unsigned mismatch + cflags = [ + "/wd4018", # size/unsigned mismatch + ] # TODO(GYP): Handle /analyze switch, when it will be used in GN. } else if (is_linux) { |