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

Side by Side Diff: mojo/mojo_edk.gyp

Issue 2083893002: Move ChromeOS/Android checking for legacy protocol to build files. (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 | « mojo/edk/system/channel.cc ('k') | mojo/mojo_edk_nacl.gyp » ('j') | 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 'mojo_edk.gypi', 10 'mojo_edk.gypi',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 'sources': [ 48 'sources': [
49 '<@(mojo_edk_system_impl_sources)', 49 '<@(mojo_edk_system_impl_sources)',
50 '<@(mojo_edk_system_impl_non_nacl_sources)', 50 '<@(mojo_edk_system_impl_non_nacl_sources)',
51 ], 51 ],
52 'conditions': [ 52 'conditions': [
53 ['OS=="android"', { 53 ['OS=="android"', {
54 'dependencies': [ 54 'dependencies': [
55 '../third_party/ashmem/ashmem.gyp:ashmem', 55 '../third_party/ashmem/ashmem.gyp:ashmem',
56 ], 56 ],
57 }], 57 }],
58 ['OS=="android" or chromeos==1', {
59 'defines': [
60 'MOJO_EDK_LEGACY_PROTOCOL',
61 ],
62 }],
58 ['OS=="win"', { 63 ['OS=="win"', {
59 # Structure was padded due to __declspec(align()), which is 64 # Structure was padded due to __declspec(align()), which is
60 # uninteresting. 65 # uninteresting.
61 'msvs_disabled_warnings': [ 4324 ], 66 'msvs_disabled_warnings': [ 4324 ],
62 }], 67 }],
63 ['OS=="mac" and OS!="ios"', { 68 ['OS=="mac" and OS!="ios"', {
64 'sources': [ 69 'sources': [
65 'edk/system/mach_port_relay.cc', 70 'edk/system/mach_port_relay.cc',
66 'edk/system/mach_port_relay.h', 71 'edk/system/mach_port_relay.h',
67 ], 72 ],
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 'configurations': { 224 'configurations': {
220 'Common_Base': { 225 'Common_Base': {
221 'msvs_target_platform': 'x64', 226 'msvs_target_platform': 'x64',
222 }, 227 },
223 }, 228 },
224 }, 229 },
225 ], 230 ],
226 }], 231 }],
227 ] 232 ]
228 } 233 }
OLDNEW
« no previous file with comments | « mojo/edk/system/channel.cc ('k') | mojo/mojo_edk_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698