Commit f1841a10 authored by Joshua Pawlicki's avatar Joshua Pawlicki Committed by Chromium LUCI CQ

Remove dependencies on third_party/adobe/flash

As far as I can tell, the actual header is no longer used anywhere.
This completes decoupling the flapper targets from the build tree,
so they are removed.

Bug: 1064651
Change-Id: I18996e13c3dbf9df097b3b964e2b0d2113cfef1b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2613324Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Reviewed-by: default avatarAnthony LaForge <laforge@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841111}
parent 2e945073
......@@ -305,13 +305,6 @@ if (!is_android && !is_mac) {
# The step's output are needed at runtime, so we also need a data_dep.
data_deps += [ ":packed_resources" ]
# Only ChromeOS has precompiled Flash that needs to get copied to the output
# directory. On other platforms, Flash is either component-updated only or
# not supported at all.
if (is_chromeos_ash) {
deps += [ "//third_party/adobe/flash:flapper_binaries" ]
}
# ChromeOS by design is safe to have rpath=$ORIGIN. This simplifies shared
# library usage.
if (is_chromeos_ash && !is_component_build) {
......
......@@ -6061,7 +6061,6 @@ static_library("browser") {
"//ppapi/host",
"//ppapi/proxy:ipc",
"//services/device/public/mojom",
"//third_party/adobe/flash:flapper_version_h",
]
if (is_chromeos_ash) {
deps += [ "//chromeos/cryptohome" ]
......
......@@ -554,7 +554,6 @@ static_library("ui") {
"//skia",
"//storage/browser",
"//storage/common",
"//third_party/adobe/flash:flapper_version_h",
"//third_party/blink/public:buildflags",
"//third_party/blink/public:resources",
"//third_party/blink/public/common",
......
......@@ -453,7 +453,6 @@ static_library("common") {
"ppapi_utils.cc",
"ppapi_utils.h",
]
public_deps += [ "//third_party/adobe/flash:flapper_version_h" ]
}
if (enable_plugins && enable_extensions) {
sources += [
......
......@@ -80,7 +80,6 @@
#if BUILDFLAG(ENABLE_PLUGINS)
#include "content/public/common/pepper_plugin_info.h"
#include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR.
#include "ppapi/shared_impl/ppapi_permissions.h" // nogncheck
#endif
......
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
if (is_chrome_branded) {
if ((is_linux || is_chromeos_lacros) && current_cpu == "x86") {
flapper_version_h_file = "symbols/ppapi/linux/flapper_version.h"
flapper_binary_files = [
"binaries/ppapi/linux/libpepflashplayer.so",
"binaries/ppapi/linux/manifest.json",
]
} else if ((is_linux || is_chromeos_lacros) && current_cpu == "x64") {
flapper_version_h_file = "symbols/ppapi/linux_x64/flapper_version.h"
flapper_binary_files = [
"binaries/ppapi/linux_x64/libpepflashplayer.so",
"binaries/ppapi/linux_x64/manifest.json",
]
} else if (is_mac && current_cpu == "x86") {
flapper_version_h_file = "symbols/ppapi/mac/flapper_version.h"
flapper_binary_files = [
"binaries/ppapi/mac/PepperFlashPlayer.plugin",
"binaries/ppapi/mac/manifest.json",
]
} else if (is_mac && current_cpu == "x64") {
flapper_version_h_file = "symbols/ppapi/mac_64/flapper_version.h"
flapper_binary_files = [
"binaries/ppapi/mac_64/PepperFlashPlayer.plugin",
"binaries/ppapi/mac_64/manifest.json",
]
} else if (is_win && current_cpu == "x86") {
flapper_version_h_file = "symbols/ppapi/win/flapper_version.h"
flapper_binary_files = [
"binaries/ppapi/win/pepflashplayer.dll",
"binaries/ppapi/win/manifest.json",
]
} else if (is_win && current_cpu == "x64") {
flapper_version_h_file = "symbols/ppapi/win_x64/flapper_version.h"
flapper_binary_files = [
"binaries/ppapi/win_x64/pepflashplayer.dll",
"binaries/ppapi/win_x64/manifest.json",
]
} else {
flapper_version_h_file = "flapper_version.h"
flapper_binary_files = []
}
} else {
flapper_version_h_file = "flapper_version.h"
flapper_binary_files = []
}
copy("flapper_version_h") {
sources = [ flapper_version_h_file ]
outputs = [ "$root_gen_dir/{{source_file_part}}" ]
}
if (flapper_binary_files == []) {
group("flapper_binaries") {
# NOP
}
} else {
copy("flapper_binaries") {
sources = flapper_binary_files
outputs = [ "$root_out_dir/PepperFlash/{{source_file_part}}" ]
}
}
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