gpu/BUILD.gn - Issue 669813003: Update from chromium https://crrev.com/301725/

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: gpu/BUILD.gn

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master

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

Index: gpu/BUILD.gn

diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn

index d1df1dd3a15153ad3fbae27ff9cc8befe49443c7..29c07960621eb2c618e401a2e19417b8683aee3e 100644

--- a/gpu/BUILD.gn

+++ b/gpu/BUILD.gn

@@ -115,12 +115,15 @@ test("gl_tests") {

"//gpu/command_buffer/client:gles2_implementation_client_side_arrays",

]

+ libs = []

+ if (is_android) {

+ deps += [

+ "//testing/android:native_test_native_code",

+ ]

+ libs += [ "android" ]

+ }

# TODO(GYP)

- # ['OS == "android"', {

- # 'dependencies': [

- # '../testing/android/native_test.gyp:native_test_native_code',

- # ],

- # }],

# ['OS == "win"', {

# 'dependencies': [

# '../third_party/angle/src/build_angle.gyp:libEGL',

« no previous file with comments | « gin/v8.isolate ('k') | gpu/command_buffer/client/BUILD.gn » ('j') | no next file with comments »