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

Side by Side Diff: mojo/public/platform/native/BUILD.gn

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years 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 source_set("system_thunks") { 5 import("../../mojo_sdk.gni")
6 visibility = [ 6
7 "//mojo/public/c/system:for_component", 7 mojo_sdk_source_set("system_thunks") {
8 "//mojo/public/c/system:for_shared_library", 8 mojo_sdk_visibility = [
9 "mojo/public/c/system:for_component",
10 "mojo/public/c/system:for_shared_library",
9 ] 11 ]
10 12
11 sources = [ 13 sources = [
12 "system_thunks.h", 14 "system_thunks.h",
13 "system_thunks.cc", 15 "system_thunks.cc",
14 ] 16 ]
15 defines = [ "MOJO_SYSTEM_IMPLEMENTATION" ] 17 defines = [ "MOJO_SYSTEM_IMPLEMENTATION" ]
16 deps = [ 18 mojo_sdk_deps = [ "mojo/public/c/system" ]
17 "//mojo/public/c/system",
18 ]
19 19
20 # The GYP target analogous to this one builds this code into a 20 # The GYP target analogous to this one builds this code into a
21 # static library. When building for Android, both the GYP and GN 21 # static library. When building for Android, both the GYP and GN
22 # builds add --exclude-libs=ALL globally, which means that all 22 # builds add --exclude-libs=ALL globally, which means that all
23 # symbols in static libraries are excluded from export. That's a 23 # symbols in static libraries are excluded from export. That's a
24 # problem, as code outside this target needs to be able to call 24 # problem, as code outside this target needs to be able to call
25 # MojoSetSystemThunks(). Therefore, the GYP target needs to specifiy 25 # MojoSetSystemThunks(). Therefore, the GYP target needs to specifiy
26 # that all dependent targets remove that link flag. Since GN uses a 26 # that all dependent targets remove that link flag. Since GN uses a
27 # source_set here, this flag change is not needed. 27 # source_set here, this flag change is not needed.
28 } 28 }
29 29
30 # GYP version: mojo/mojo_public_gles2_for_loadable_module.gypi 30 mojo_sdk_source_set("gles2_thunks") {
31 source_set("gles2_thunks") { 31 mojo_sdk_visibility = [ "mojo/public/gles2:for_shared_library" ]
32 visibility = [ "//mojo/public/gles2:for_shared_library" ]
33 32
34 sources = [ 33 sources = [
35 "gles2_thunks.cc", 34 "gles2_thunks.cc",
36 "gles2_thunks.h", 35 "gles2_thunks.h",
37 "gles2_impl_thunks.cc", 36 "gles2_impl_thunks.cc",
38 "gles2_impl_thunks.h", 37 "gles2_impl_thunks.h",
39 "gles2_impl_chromium_texture_mailbox_thunks.cc", 38 "gles2_impl_chromium_texture_mailbox_thunks.cc",
40 "gles2_impl_chromium_texture_mailbox_thunks.h", 39 "gles2_impl_chromium_texture_mailbox_thunks.h",
41 "gles2_impl_chromium_sync_point_thunks.cc", 40 "gles2_impl_chromium_sync_point_thunks.cc",
42 "gles2_impl_chromium_sync_point_thunks.h", 41 "gles2_impl_chromium_sync_point_thunks.h",
43 ] 42 ]
44 43
45 defines = [ "MOJO_GLES2_IMPLEMENTATION" ] 44 defines = [ "MOJO_GLES2_IMPLEMENTATION" ]
46 45
47 configs += [ "//third_party/khronos:khronos_headers" ] 46 configs = [ "//third_party/khronos:khronos_headers" ]
48 47
49 deps = [ 48 mojo_sdk_deps = [
50 "//mojo/public/c/gles2", 49 "mojo/public/c/gles2:headers",
51 "//mojo/public/c/environment", 50 "mojo/public/c/environment",
52 "//mojo/public/c/system", 51 "mojo/public/c/system",
53 ] 52 ]
54 53
55 if (is_mac) { 54 if (is_mac) {
56 # TODO(GYP): Make it a run-path dependent library. 55 # TODO(GYP): Make it a run-path dependent library.
57 # 'DYLIB_INSTALL_NAME_BASE': '@loader_path', 56 # 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
58 } 57 }
59 } 58 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698