include/views/SkWindow.h - Issue 2099693002: Revert of Remove Android SampleApp

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: include/views/SkWindow.h

Issue 2099693002: Revert of Remove Android SampleApp (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 6 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: include/views/SkWindow.h

diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h

index f81ec5d06ec092c04034e7f7fc93b71fd1593463..50774849a6b605c6eeccb79959ee2d7b83522b82 100644

--- a/include/views/SkWindow.h

+++ b/include/views/SkWindow.h

@@ -129,7 +129,7 @@

#elif defined(SK_BUILD_FOR_WIN)

#include "SkOSWindow_Win.h"

#elif defined(SK_BUILD_FOR_ANDROID)

- #error Android does not support SkOSWindow and SampleApp. Please use Viewer instead.

+ #include "SkOSWindow_Android.h"

#elif defined(SK_BUILD_FOR_UNIX)

#include "SkOSWindow_Unix.h"

#elif defined(SK_BUILD_FOR_IOS)