Commit 2aa56a9f authored by deepak1556's avatar deepak1556 Committed by Commit Bot

fix: disable kPlugin helper when enable_plugins=false

Bug: none
Change-Id: Iace766c61a64987fa4c25a12b0a74b3ec09d2c60
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2173416
Auto-Submit: Deepak Mohan <hop2deep@gmail.com>
Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#765333}
parent 9a54665a
......@@ -32,6 +32,7 @@
#include "ipc/ipc_logging.h"
#include "ipc/message_filter.h"
#include "mojo/public/cpp/bindings/lib/message_quota_checker.h"
#include "ppapi/buildflags/buildflags.h"
#include "services/resource_coordinator/public/mojom/memory_instrumentation/constants.mojom.h"
#include "services/service_manager/public/cpp/interface_provider.h"
......@@ -95,8 +96,10 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) {
child_base_name += kMacHelperSuffix_renderer;
} else if (flags == CHILD_GPU) {
child_base_name += kMacHelperSuffix_gpu;
#if BUILDFLAG(ENABLE_PLUGINS)
} else if (flags == CHILD_PLUGIN) {
child_base_name += kMacHelperSuffix_plugin;
#endif
} else {
NOTREACHED();
}
......
......@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//ppapi/buildflags/buildflags.gni")
# This list defines variants of the helper app bundles that macOS //content
# embedders need to produce. The different variants are code signed with
# different entitlements, which afford different capabilities depending on the
......@@ -45,13 +47,17 @@ content_mac_helpers = [
"",
" (GPU)",
],
# A helper that does not perform library validation, allowing code not signed
# by either Apple or the signing identity to be loaded, and that can execute
# unsigned memory. This is used by binary plugins like Flash.
[
"plugin",
".plugin",
" (Plugin)",
],
]
if (enable_plugins) {
content_mac_helpers += [
# A helper that does not perform library validation, allowing code not signed
# by either Apple or the signing identity to be loaded, and that can execute
# unsigned memory. This is used by binary plugins like Flash.
[
"plugin",
".plugin",
" (Plugin)",
],
]
}
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