Android.mk - Issue 164793002: Small fixes for auto generating Android.mk

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: Android.mk

Issue 164793002: Small fixes for auto generating Android.mk (Closed) Base URL: https://skia.googlesource.com/skia.git@skia_android_framework

Patch Set: Re upload Created 6 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: Android.mk

diff --git a/Android.mk b/Android.mk

index 54b630ea6e590d864e89fc111eaa9846ac92be12..005f04e68e7641f0ab9fe009b75a654d47a4420f 100644

--- a/Android.mk

+++ b/Android.mk

@@ -58,7 +58,6 @@ LOCAL_CFLAGS += \

-Winit-self \

-Wpointer-arith \

-Wno-unused-parameter \

- -Wno-c++11-extensions \

scroggo 2014/02/13 21:26:14 This isn't checked in, but I tracked a branch that

-U_FORTIFY_SOURCE \

-D_FORTIFY_SOURCE=1 \

-fuse-ld=gold \

@@ -78,7 +77,6 @@ LOCAL_CFLAGS += \

-DSK_BUILD_FOR_ANDROID \

-DSK_FONTHOST_DOES_NOT_USE_FONTMGR \

-DSK_USE_POSIX_THREADS \

- -DGR_CHROME_UTILS=1 \

-DSK_SUPPORT_PDF

LOCAL_CPPFLAGS := \

@@ -514,7 +512,6 @@ LOCAL_SRC_FILES := \

src/gpu/gl/debug/SkDebugGLContext.cpp \

src/gpu/gl/GrGLCreateNullInterface.cpp \

src/gpu/gl/SkNullGLContext.cpp \

- ../experimental/ChromeUtils/SkBorder.cpp \

src/core/SkFlate.cpp

LOCAL_SHARED_LIBRARIES := \

« no previous file with comments | « no previous file | gyp/common_conditions.gypi » ('j') | no next file with comments »