src/pdf/SkPDFFont.cpp - Issue 1414643002: Enable BUILD file compilation of skia and dm with --config=android_arm.

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/pdf/SkPDFFont.cpp

Issue 1414643002: Enable BUILD file compilation of skia and dm with --config=android_arm. (Closed) Base URL: https://skia.googlesource.com/skia@master

Patch Set: Use -mfpu=neon everywhere for Android; fold opts targets back into srcs. Created 5 years, 2 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:

View side-by-side diff with in-line comments

Download patch

Index: src/pdf/SkPDFFont.cpp

diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp

index 9cbada836403dbde8307f77f054d3b38e3e08d44..0d6f3187995594ad523a31b9f59d4b3f2cf3e32d 100644

--- a/src/pdf/SkPDFFont.cpp

+++ b/src/pdf/SkPDFFont.cpp

@@ -25,9 +25,11 @@

#include "SkUtils.h"

#if defined (GOOGLE3)

- // #including #defines doesn't work in with this build system.

- #include "typography/font/sfntly/src/sample/chromium/font_subsetter.h"

- #define SK_SFNTLY_SUBSETTER // For the benefit of #ifdefs below.

+ #if !defined (SK_BUILD_FOR_ANDROID)

+ // #including #defines doesn't work with this build system.

+ #include "typography/font/sfntly/src/sample/chromium/font_subsetter.h"

+ #define SK_SFNTLY_SUBSETTER // For the benefit of #ifdefs below.

+ #endif

#elif defined (SK_SFNTLY_SUBSETTER)

#include SK_SFNTLY_SUBSETTER

#endif

« no previous file with comments | « BUILD.public ('k') | tools/BUILD.public.expected » ('j') | no next file with comments »