Commit 5008174c authored by jamesr's avatar jamesr Committed by Commit bot

GN: Make content and content_shell work when !enable_plugins

The android build has enable_plugins=false, so this gets the linux
!enable_plugins build working to get android closer.

R=brettw@chromium.org

Review URL: https://codereview.chromium.org/542883003

Cr-Commit-Position: refs/heads/master@{#293892}
parent 9490ed19
...@@ -12,7 +12,6 @@ config("content_implementation") { ...@@ -12,7 +12,6 @@ config("content_implementation") {
content_shared_components = [ content_shared_components = [
"//content/gpu", "//content/gpu",
"//content/plugin", "//content/plugin",
"//content/ppapi_plugin",
"//content/public/browser:sources", "//content/public/browser:sources",
"//content/public/child", "//content/public/child",
"//content/public/common", "//content/public/common",
...@@ -22,6 +21,10 @@ content_shared_components = [ ...@@ -22,6 +21,10 @@ content_shared_components = [
"//content/renderer", "//content/renderer",
] ]
if (enable_plugins) {
content_shared_components += [ "//content/ppapi_plugin" ]
}
if (is_component_build) { if (is_component_build) {
shared_library("content") { shared_library("content") {
deps = content_shared_components + [ deps = content_shared_components + [
......
...@@ -47,7 +47,6 @@ source_set("child") { ...@@ -47,7 +47,6 @@ source_set("child") {
"npapi/plugin_host.h", "npapi/plugin_host.h",
"npapi/plugin_instance.cc", "npapi/plugin_instance.cc",
"npapi/plugin_instance.h", "npapi/plugin_instance.h",
"npapi/plugin_instance_mac.mm",
"npapi/plugin_lib.cc", "npapi/plugin_lib.cc",
"npapi/plugin_lib.h", "npapi/plugin_lib.h",
"npapi/plugin_stream.cc", "npapi/plugin_stream.cc",
...@@ -55,26 +54,42 @@ source_set("child") { ...@@ -55,26 +54,42 @@ source_set("child") {
"npapi/plugin_stream_posix.cc", "npapi/plugin_stream_posix.cc",
"npapi/plugin_stream_url.cc", "npapi/plugin_stream_url.cc",
"npapi/plugin_stream_url.h", "npapi/plugin_stream_url.h",
"npapi/plugin_stream_win.cc",
"npapi/plugin_string_stream.cc", "npapi/plugin_string_stream.cc",
"npapi/plugin_string_stream.h", "npapi/plugin_string_stream.h",
"npapi/plugin_url_fetcher.cc", "npapi/plugin_url_fetcher.cc",
"npapi/plugin_url_fetcher.h", "npapi/plugin_url_fetcher.h",
"npapi/plugin_web_event_converter_mac.h",
"npapi/plugin_web_event_converter_mac.mm",
"npapi/webplugin.h", "npapi/webplugin.h",
"npapi/webplugin_accelerated_surface_mac.h",
"npapi/webplugin_delegate.h", "npapi/webplugin_delegate.h",
"npapi/webplugin_delegate_impl.cc", "npapi/webplugin_delegate_impl.cc",
"npapi/webplugin_delegate_impl.h", "npapi/webplugin_delegate_impl.h",
"npapi/webplugin_delegate_impl_android.cc",
"npapi/webplugin_delegate_impl_aura.cc",
"npapi/webplugin_delegate_impl_mac.mm",
"npapi/webplugin_delegate_impl_win.cc",
"npapi/webplugin_ime_win.cc",
"npapi/webplugin_ime_win.h",
"npapi/webplugin_resource_client.h", "npapi/webplugin_resource_client.h",
] ]
if (is_mac) {
sources -= [
"npapi/plugin_instance_mac.mm",
"npapi/plugin_web_event_converter_mac.h",
"npapi/plugin_web_event_converter_mac.mm",
"npapi/webplugin_accelerated_surface_mac.h",
"npapi/webplugin_delegate_impl_mac.mm",
]
} else if (is_win) {
sources -= [
"npapi/plugin_stream_win.cc",
"npapi/webplugin_delegate_impl_win.cc",
"npapi/webplugin_ime_win.cc",
"npapi/webplugin_ime_win.h",
]
} else if (is_android) {
sources -= [
"npapi/webplugin_delegate_impl_android.cc",
]
}
if (use_aura) {
sources -= [
"npapi/webplugin_delegate_impl_aura.cc",
]
}
} }
configs += [ configs += [
......
...@@ -164,6 +164,16 @@ source_set("renderer") { ...@@ -164,6 +164,16 @@ source_set("renderer") {
".", "//content") ".", "//content")
} }
if (!enable_pepper_cdms) {
sources -= [
"media/crypto/pepper_cdm_wrapper.h",
"media/crypto/pepper_cdm_wrapper_impl.cc",
"media/crypto/pepper_cdm_wrapper_impl.h",
"media/crypto/ppapi_decryptor.cc",
"media/crypto/ppapi_decryptor.h",
]
}
if (printing_mode == 1) { if (printing_mode == 1) {
deps += [ "//printing" ] deps += [ "//printing" ]
} }
......
...@@ -214,7 +214,6 @@ static_library("content_shell_lib") { ...@@ -214,7 +214,6 @@ static_library("content_shell_lib") {
"//content/app/resources", "//content/app/resources",
"//content/app/strings", "//content/app/strings",
"//content/gpu", "//content/gpu",
"//content/ppapi_plugin",
"//content/public/browser", "//content/public/browser",
"//content/public/common", "//content/public/common",
"//content/public/plugin", "//content/public/plugin",
...@@ -243,6 +242,9 @@ static_library("content_shell_lib") { ...@@ -243,6 +242,9 @@ static_library("content_shell_lib") {
"//v8", "//v8",
#'copy_test_netscape_plugin', TODO(GYP) #'copy_test_netscape_plugin', TODO(GYP)
] ]
if (enable_plugins) {
deps += [ "//content/ppapi_plugin" ]
}
if (is_win) { if (is_win) {
#'LinkIncremental': '<(msvs_large_module_debug_link_mode)', TODO(GYP) #'LinkIncremental': '<(msvs_large_module_debug_link_mode)', TODO(GYP)
......
...@@ -44,7 +44,6 @@ static_library("test_support") { ...@@ -44,7 +44,6 @@ static_library("test_support") {
"//content/browser/speech/proto", "//content/browser/speech/proto",
"//content/child", "//content/child",
"//content/gpu", "//content/gpu",
"//content/ppapi_plugin",
"//content/public/renderer", "//content/public/renderer",
"//content/public/utility", "//content/public/utility",
"//cc", "//cc",
...@@ -66,6 +65,10 @@ static_library("test_support") { ...@@ -66,6 +65,10 @@ static_library("test_support") {
"//third_party/WebKit/public:blink", "//third_party/WebKit/public:blink",
] ]
if (enable_plugins) {
deps += [ "//content/ppapi_plugin" ]
}
if (enable_webrtc) { if (enable_webrtc) {
# TODO(GYP) remove this when libjingle is converted. # TODO(GYP) remove this when libjingle is converted.
configs += [ "//third_party/libjingle:jingle_direct_dependent_configs" ] configs += [ "//third_party/libjingle:jingle_direct_dependent_configs" ]
...@@ -87,6 +90,9 @@ static_library("test_support") { ...@@ -87,6 +90,9 @@ static_library("test_support") {
"//third_party/webrtc/modules/video_capture", "//third_party/webrtc/modules/video_capture",
] ]
} }
if (!enable_plugins) {
sources -= [ "ppapi_unittest.cc" ]
}
if (use_glib) { if (use_glib) {
configs += [ "//build/config/linux:glib" ] configs += [ "//build/config/linux:glib" ]
......
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