build/secondary/third_party/libjpeg_turbo/BUILD.gn - Issue 903273002: Update from https://crrev.com/315085

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: build/secondary/third_party/libjpeg_turbo/BUILD.gn

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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: build/secondary/third_party/libjpeg_turbo/BUILD.gn

diff --git a/build/secondary/third_party/libjpeg_turbo/BUILD.gn b/build/secondary/third_party/libjpeg_turbo/BUILD.gn

index 82472e78c1d1571f30d6a36f56f6ed704b573842..be1630207c68d610ed39f9c8a0cde2d527ace067 100644

--- a/build/secondary/third_party/libjpeg_turbo/BUILD.gn

+++ b/build/secondary/third_party/libjpeg_turbo/BUILD.gn

@@ -84,7 +84,7 @@ if (cpu_arch == "x86" || cpu_arch == "x64") {

} else if (is_mac) {

defines += [ "MACHO" ]

include_dirs = [ "mac" ]

- } else if (is_linux) {

+ } else if (is_linux || is_android) {

defines += [ "ELF" ]

include_dirs = [ "linux" ]

}

« no previous file with comments | « build/sanitizers/tsan_suppressions.cc ('k') | build/whitespace_file.txt » ('j') | no next file with comments »