Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Side by Side 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 unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 assert(!defined(is_nacl) || !is_nacl)
6
5 import("../../mojo_sdk.gni") 7 import("../../mojo_sdk.gni")
6 8
7 mojo_sdk_source_set("system") { 9 mojo_sdk_source_set("system") {
8 sources = [ 10 sources = [
11 "system_thunks.cc",
9 "system_thunks.h", 12 "system_thunks.h",
10 "system_thunks.cc",
11 ] 13 ]
12 defines = [ "MOJO_SYSTEM_IMPLEMENTATION" ] 14 defines = [ "MOJO_SYSTEM_IMPLEMENTATION" ]
13 mojo_sdk_deps = [ "mojo/public/c/system" ] 15 mojo_sdk_deps = [ "mojo/public/c/system" ]
14 16
15 # The GYP target analogous to this one builds this code into a 17 # The GYP target analogous to this one builds this code into a
16 # static library. When building for Android, both the GYP and GN 18 # static library. When building for Android, both the GYP and GN
17 # builds add --exclude-libs=ALL globally, which means that all 19 # builds add --exclude-libs=ALL globally, which means that all
18 # symbols in static libraries are excluded from export. That's a 20 # symbols in static libraries are excluded from export. That's a
19 # problem, as code outside this target needs to be able to call 21 # problem, as code outside this target needs to be able to call
20 # MojoSetSystemThunks(). Therefore, the GYP target needs to specifiy 22 # MojoSetSystemThunks(). Therefore, the GYP target needs to specifiy
21 # that all dependent targets remove that link flag. Since GN uses a 23 # that all dependent targets remove that link flag. Since GN uses a
22 # source_set here, this flag change is not needed. 24 # source_set here, this flag change is not needed.
23 } 25 }
24 26
25 mojo_sdk_source_set("gles2") { 27 mojo_sdk_source_set("gles2") {
26 sources = [ 28 sources = [
29 "gles2_impl_chromium_sync_point_thunks.cc",
30 "gles2_impl_chromium_sync_point_thunks.h",
31 "gles2_impl_chromium_texture_mailbox_thunks.cc",
32 "gles2_impl_chromium_texture_mailbox_thunks.h",
33 "gles2_impl_thunks.cc",
34 "gles2_impl_thunks.h",
27 "gles2_thunks.cc", 35 "gles2_thunks.cc",
28 "gles2_thunks.h", 36 "gles2_thunks.h",
29 "gles2_impl_thunks.cc",
30 "gles2_impl_thunks.h",
31 "gles2_impl_chromium_texture_mailbox_thunks.cc",
32 "gles2_impl_chromium_texture_mailbox_thunks.h",
33 "gles2_impl_chromium_sync_point_thunks.cc",
34 "gles2_impl_chromium_sync_point_thunks.h",
35 ] 37 ]
36 38
37 defines = [ "MOJO_GLES2_IMPLEMENTATION" ] 39 defines = [ "MOJO_GLES2_IMPLEMENTATION" ]
38 40
39 configs = [ "//third_party/khronos:khronos_headers" ] 41 configs = [ "//third_party/khronos:khronos_headers" ]
40 42
41 mojo_sdk_deps = [ 43 mojo_sdk_deps = [
42 "mojo/public/c/gles2:headers", 44 "mojo/public/c/gles2:headers",
43 "mojo/public/c/environment", 45 "mojo/public/c/environment",
44 "mojo/public/c/system", 46 "mojo/public/c/system",
45 ] 47 ]
46 48
47 if (is_mac) { 49 if (is_mac) {
48 # TODO(GYP): Make it a run-path dependent library. 50 # TODO(GYP): Make it a run-path dependent library.
49 # 'DYLIB_INSTALL_NAME_BASE': '@loader_path', 51 # 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
50 } 52 }
51 } 53 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698