Skip to content

GitLab

T
tangled
Commit 8425d8fb authored by Michael Giuffrida's avatar Michael Giuffrida Committed by Commit Bot
Browse files
Options

Enable gn check for //extensions/shell 

This fixes deps and enables gn check for:

  //extensions/shell:app_shell
  //extensions/shell:app_shell_lib
  //extensions/shell:app_shell_unittests
  //extensions/shell/browser/system_logs

which lets us specify //extensions/shell/* in //.gn.

Some headers (esp. for NaCl) need to be annotated with // nogncheck
because gn doesn't run the preprocessor:
https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/reference.md#what-gets-checked

Bug: 367595
Change-Id: If37c5935cb993aa13f7586ee8ff17cdb23dddfc3
Reviewed-on: https://chromium-review.googlesource.com/958282Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Reviewed-by: default avatarBen Wells <benwells@chromium.org>
Commit-Queue: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543768}
parent 33dd468c
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 22 deletions
.gn
View file @ 8425d8fb
......@@ -111,8 +111,7 @@ check_targets = [
"//extensions/browser:unit_tests",
"//extensions/common:unit_tests",
"//extensions/renderer:unit_tests",
"//extensions/shell:browser_tests",
"//extensions/shell:unit_tests",
"//extensions/shell/*",
"//gin/*",
"//google_apis/*",
"//google_update/*",
......
extensions/shell/BUILD.gn
View file @ 8425d8fb
......@@ -41,7 +41,6 @@ source_set("app_shell_lib") {
"//base",
"//components/feedback",
"//components/guest_view/browser",
"//components/guest_view/common",
"//components/guest_view/renderer",
"//components/keep_alive_registry",
"//components/keyed_service/content:content",
......@@ -49,13 +48,15 @@ source_set("app_shell_lib") {
"//components/network_session_configurator/common",
"//components/pref_registry",
"//components/prefs",
"//components/storage_monitor",
"//components/update_client",
"//components/user_prefs",
"//components/web_cache/renderer",
"//components/version_info",
"//content",
"//content/shell:content_shell_lib",
"//device/base",
"//device/bluetooth",
"//device/usb",
"//extensions:extensions_resources",
"//extensions:shell_and_test_pak",
"//extensions/browser",
......@@ -68,12 +69,10 @@ source_set("app_shell_lib") {
"//extensions/shell/common/api",
"//extensions/shell/common/api:api_registration",
"//extensions/shell/common/api:extensions_features",
"//skia",
"//google_apis",
"//third_party/WebKit/public:blink",
"//third_party/cld_3/src/src:cld_3",
"//ui/base",
"//ui/base/ime",
"//v8",
]
# TODO(michaelpg): remove Mac support and always use aura.
......@@ -84,7 +83,7 @@ source_set("app_shell_lib") {
]
if (use_x11) {
deps += [ "//ui/events" ]
deps += [ "//ui/events/devices/x11" ]
}
}
......@@ -201,6 +200,9 @@ source_set("app_shell_lib") {
"//ui/wm",
"//ui/wm/public",
]
if (is_chromeos) {
deps += [ "//ui/ozone" ]
}
}
if (is_desktop_linux) {
......@@ -221,7 +223,6 @@ source_set("app_shell_lib") {
if (is_chromeos) {
sources += [
"browser/api/vpn_provider/vpn_service_factory.cc",
"browser/api/vpn_provider/vpn_service_factory.h",
"browser/shell_screen.cc",
"browser/shell_screen.h",
]
......@@ -244,6 +245,7 @@ source_set("app_shell_lib") {
"//components/nacl/loader",
"//components/nacl/renderer",
"//components/nacl/renderer/plugin:nacl_trusted_plugin",
"//ppapi/shared_impl:shared_impl",
]
if (is_linux) {
......@@ -266,6 +268,7 @@ if (is_mac) {
deps = [
":app_shell_framework_bundle_data",
"//build/config:exe_and_shlib_deps",
"//content/public/app:both",
"//extensions:shell_and_test_pak",
]
ldflags = [
......@@ -286,12 +289,14 @@ if (is_mac) {
":app_shell_lib",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
"//content/public/app:both",
"//extensions:shell_and_test_pak",
]
if (is_win) {
configs += [ "//build/config/win:windowed" ]
configs -= [ "//build/config/win:console" ]
deps += [ "//sandbox/win:sandbox" ]
}
}
}
......@@ -322,14 +327,21 @@ test("app_shell_unittests") {
"//apps",
"//base",
"//base/test:test_support",
"//components/crx_file",
"//components/feedback",
"//components/keep_alive_registry",
"//components/prefs",
"//components/user_prefs",
"//content/test:test_support",
"//extensions:shell_and_test_pak",
"//extensions:test_support",
"//extensions/browser",
"//extensions/common",
"//extensions/common/api",
"//extensions/shell/browser/system_logs",
"//google_apis",
"//testing/gtest",
"//ui/gl:test_support",
]
data_deps = [
......@@ -359,7 +371,10 @@ test("app_shell_unittests") {
"browser/shell_audio_controller_chromeos_unittest.cc",
"browser/shell_screen_unittest.cc",
]
deps += [ "//chromeos:test_support_without_gmock" ]
deps += [
"//chromeos",
"//chromeos:test_support_without_gmock",
]
}
if (enable_nacl) {
......@@ -417,6 +432,7 @@ if (is_mac) {
]
deps = [
":app_shell_framework_resources",
"//content/public/app:both",
]
ldflags = [ "-Wl,-install_name,@rpath/Frameworks/App Shell Framework.framework/App Shell Framework" ]
if (is_component_build) {
......@@ -437,6 +453,7 @@ if (is_mac) {
deps = [
":app_shell_framework+link",
"//build/config:exe_and_shlib_deps",
"//content/public/app:both",
]
ldflags = [
"-rpath",
......
extensions/shell/app/shell_main_delegate.cc
View file @ 8425d8fb
......@@ -32,9 +32,9 @@
#endif
#if BUILDFLAG(ENABLE_NACL)
#include "components/nacl/common/nacl_switches.h"
#include "components/nacl/common/nacl_switches.h" // nogncheck
#if defined(OS_LINUX)
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/common/nacl_paths.h" // nogncheck
#endif // OS_LINUX
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
......@@ -50,8 +50,8 @@
#endif
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
#include "components/crash/content/app/breakpad_linux.h"
#include "components/crash/content/app/crash_reporter_client.h"
#include "components/crash/content/app/breakpad_linux.h" // nogncheck
#include "components/crash/content/app/crash_reporter_client.h" // nogncheck
#include "extensions/shell/app/shell_crash_reporter_client.h"
#endif
......
extensions/shell/browser/shell_browser_main_parts.cc
View file @ 8425d8fb
......@@ -76,7 +76,7 @@
#endif
#if defined(USE_AURA) && defined(USE_X11)
#include "ui/events/devices/x11/touch_factory_x11.h"
#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
#endif
using base::CommandLine;
......
extensions/shell/browser/shell_content_browser_client.cc
View file @ 8425d8fb
......@@ -49,8 +49,8 @@
#include "components/nacl/browser/nacl_browser.h"
#include "components/nacl/browser/nacl_host_message_filter.h"
#include "components/nacl/browser/nacl_process_host.h"
#include "components/nacl/common/nacl_process_type.h"
#include "components/nacl/common/nacl_switches.h"
#include "components/nacl/common/nacl_process_type.h" // nogncheck
#include "components/nacl/common/nacl_switches.h" // nogncheck
#include "content/public/browser/browser_child_process_host.h"
#include "content/public/browser/child_process_data.h"
#endif
......
extensions/shell/browser/shell_desktop_controller_aura.cc
View file @ 8425d8fb
......@@ -41,7 +41,7 @@
#include "ui/display/types/display_mode.h"
#include "ui/display/types/display_snapshot.h"
#include "ui/display/types/native_display_delegate.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/ozone_platform.h" // nogncheck
#else
#include "ui/views/widget/desktop_aura/desktop_screen.h"
#endif // defined(OS_CHROMEOS)
......
extensions/shell/common/shell_content_client.cc
View file @ 8425d8fb
......@@ -17,10 +17,10 @@
#include "base/base_paths.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "components/nacl/common/nacl_constants.h"
#include "components/nacl/renderer/plugin/ppapi_entrypoints.h"
#include "content/public/common/pepper_plugin_info.h"
#include "ppapi/shared_impl/ppapi_permissions.h"
#include "components/nacl/common/nacl_constants.h" // nogncheck
#include "components/nacl/renderer/plugin/ppapi_entrypoints.h" // nogncheck
#include "content/public/common/pepper_plugin_info.h" // nogncheck
#include "ppapi/shared_impl/ppapi_permissions.h" // nogncheck
#endif
namespace extensions {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment