third_party/adobe/flash/BUILD.gn - Issue 2340643002: Do not reference non-existant bundled flash on Chrome OS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/adobe/flash/BUILD.gn

Issue 2340643002: Do not reference non-existant bundled flash on Chrome OS. (Closed)

Patch Set: Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/adobe/flash/BUILD.gn

diff --git a/third_party/adobe/flash/BUILD.gn b/third_party/adobe/flash/BUILD.gn

index 6a15c0bbe51f34619e4c8caa5142a327317fb551..87ef093ba15ef068163267f72af0860e0f2a9161 100644

--- a/third_party/adobe/flash/BUILD.gn

+++ b/third_party/adobe/flash/BUILD.gn

@@ -5,13 +5,13 @@

import("//build/config/chrome_build.gni")

if (is_chrome_branded) {

- if (is_linux && current_cpu == "x86") {

+ if (is_linux && !is_chromeos && 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 && current_cpu == "x64") {

+ } else if (is_linux && !is_chromeos && current_cpu == "x64") {

flapper_version_h_file = "symbols/ppapi/linux_x64/flapper_version.h"

flapper_binary_files = [

"binaries/ppapi/linux_x64/libpepflashplayer.so",