gyp/bench.gyp - Issue 1696483002: Update Android framework makefile to build static and shared libs

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: gyp/bench.gyp

Issue 1696483002: Update Android framework makefile to build static and shared libs (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: rebaseline Created 4 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:

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

Download patch

Index: gyp/bench.gyp

diff --git a/gyp/bench.gyp b/gyp/bench.gyp

index 7c5d6df259f25148874cfcdf5b96368f25c100eb..e9908b5860f9abe7c811f812bbba2f3ddf806adc 100644

--- a/gyp/bench.gyp

+++ b/gyp/bench.gyp

@@ -31,10 +31,8 @@

'conditions': [

['skia_android_framework', {

'libraries': [

- '-lskia',

- '-landroid',

scroggo 2016/02/12 15:00:31 So these libraries are no longer needed?

djsollen 2016/02/12 15:57:56 right. Tom moved the files that depended on them i

+ 'skia_static.a',

'-lhwui',

- '-lutils',

'include_dirs': [

'../../../frameworks/base/libs/hwui/',

« no previous file with comments | « no previous file | gyp/dm.gyp » ('j') | platform_tools/android/gyp_gen/makefile_writer.py » ('J')