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

Side by Side Diff: mojo/mojo_edk_nacl.gyp

Issue 2085203002: Add missing define for Mojo NaCl build on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common_untrusted.gypi', 10 '../build/common_untrusted.gypi',
(...skipping 23 matching lines...) Expand all
34 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 34 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
35 'mojo_public.gyp:mojo_public_system', 35 'mojo_public.gyp:mojo_public_system',
36 ], 36 ],
37 'defines': [ 37 'defines': [
38 'MOJO_SYSTEM_IMPL_IMPLEMENTATION', 38 'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
39 ], 39 ],
40 'sources': [ 40 'sources': [
41 '<@(mojo_edk_ports_sources)', 41 '<@(mojo_edk_ports_sources)',
42 '<@(mojo_edk_system_impl_sources)', 42 '<@(mojo_edk_system_impl_sources)',
43 ], 43 ],
44 'conditions': [
45 ['OS=="android" or chromeos==1', {
46 'defines': [
47 'MOJO_EDK_LEGACY_PROTOCOL',
48 ],
49 }],
50 ],
44 }, 51 },
45 { 52 {
46 'target_name': 'mojo_system_impl_nacl_nonsfi', 53 'target_name': 'mojo_system_impl_nacl_nonsfi',
47 'type': 'none', 54 'type': 'none',
48 'variables': { 55 'variables': {
49 'nacl_untrusted_build': 1, 56 'nacl_untrusted_build': 1,
50 'nlib_target': 'libmojo_system_impl_nacl_nonsfi.a', 57 'nlib_target': 'libmojo_system_impl_nacl_nonsfi.a',
51 'build_glibc': 0, 58 'build_glibc': 0,
52 'build_newlib': 0, 59 'build_newlib': 0,
53 'build_irt': 0, 60 'build_irt': 0,
(...skipping 15 matching lines...) Expand all
69 'conditions': [ 76 'conditions': [
70 ['OS=="android" or chromeos==1', { 77 ['OS=="android" or chromeos==1', {
71 'defines': [ 78 'defines': [
72 'MOJO_EDK_LEGACY_PROTOCOL', 79 'MOJO_EDK_LEGACY_PROTOCOL',
73 ], 80 ],
74 }], 81 }],
75 ], 82 ],
76 }, 83 },
77 ], 84 ],
78 } 85 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698