src/images/SkForceLinking.cpp - Issue 1036283002: Remove all code related to NaCl

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: src/images/SkForceLinking.cpp

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Rebase Created 5 years, 9 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: src/images/SkForceLinking.cpp

diff --git a/src/images/SkForceLinking.cpp b/src/images/SkForceLinking.cpp

index 4f604a203a87867e1788ea5ddc1b7600972d9e85..55b7021432b7367f9327ba1d61df60a4ad1d8ef5 100644

--- a/src/images/SkForceLinking.cpp

+++ b/src/images/SkForceLinking.cpp

@@ -26,8 +26,7 @@ int SkForceLinking(bool doNotPassTrue) {

CreateASTCImageDecoder();

#endif

// Only link GIF and PNG on platforms that build them. See images.gyp

-#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_NACL) \

- && !defined(SK_BUILD_FOR_IOS)

+#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_IOS)

CreateGIFImageDecoder();

#endif

#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_IOS)

« no previous file with comments | « site/user/quick/nacl.md ('k') | tests/PathOpsSkpClipTest.cpp » ('j') | no next file with comments »