third_party/mojo/src/mojo/public/platform/native/BUILD.gn - Issue 1019173002: Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18

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: third_party/mojo/src/mojo/public/platform/native/BUILD.gn

Issue 1019173002: Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Keep permission service alive if embedder drops requests Created 5 years, 9 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

« no previous file with comments | « third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc ('k') | third_party/mojo/src/mojo/public/platform/native_cgo/system_cgo.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/platform/native/BUILD.gn

diff --git a/third_party/mojo/src/mojo/public/platform/native/BUILD.gn b/third_party/mojo/src/mojo/public/platform/native/BUILD.gn

index a369e171d0186729c0a4dcde4986d518b4e4e88e..fa23fb17dae25e8888d7c063a01f44fa008e3f16 100644

--- a/third_party/mojo/src/mojo/public/platform/native/BUILD.gn

+++ b/third_party/mojo/src/mojo/public/platform/native/BUILD.gn

@@ -2,12 +2,14 @@

# Use of this source code is governed by a BSD-style license that can be

# found in the LICENSE file.

+assert(!defined(is_nacl) || !is_nacl)

import("../../mojo_sdk.gni")

mojo_sdk_source_set("system") {

sources = [

- "system_thunks.h",

"system_thunks.cc",

+ "system_thunks.h",

]

defines = [ "MOJO_SYSTEM_IMPLEMENTATION" ]

mojo_sdk_deps = [ "mojo/public/c/system" ]

@@ -24,14 +26,14 @@ mojo_sdk_source_set("system") {

mojo_sdk_source_set("gles2") {

sources = [

- "gles2_thunks.cc",

- "gles2_thunks.h",

- "gles2_impl_thunks.cc",

- "gles2_impl_thunks.h",

- "gles2_impl_chromium_texture_mailbox_thunks.cc",

- "gles2_impl_chromium_texture_mailbox_thunks.h",

"gles2_impl_chromium_sync_point_thunks.cc",

"gles2_impl_chromium_sync_point_thunks.h",

+ "gles2_impl_chromium_texture_mailbox_thunks.cc",

+ "gles2_impl_chromium_texture_mailbox_thunks.h",

+ "gles2_impl_thunks.cc",

+ "gles2_impl_thunks.h",

+ "gles2_thunks.cc",

+ "gles2_thunks.h",

]

defines = [ "MOJO_GLES2_IMPLEMENTATION" ]