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

Side by Side Diff: mojo/mojo_nacl.gyp

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 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['disable_nacl==0 and disable_nacl_untrusted==0', { 7 ['disable_nacl==0 and disable_nacl_untrusted==0', {
8 'variables': { 8 'variables': {
9 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/bui ld/inverse_depth.py <(DEPTH))/monacl', 9 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/bui ld/inverse_depth.py <(DEPTH))/monacl',
10 }, 10 },
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 ], 47 ],
48 'include_dirs': [ 48 'include_dirs': [
49 '..', 49 '..',
50 ], 50 ],
51 'sources': [ 51 'sources': [
52 '<(monacl_codegen_dir)/mojo_syscall.cc', 52 '<(monacl_codegen_dir)/mojo_syscall.cc',
53 'nacl/monacl_sel_main.cc', 53 'nacl/monacl_sel_main.cc',
54 ], 54 ],
55 'dependencies': [ 55 'dependencies': [
56 '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime. gyp:sel', 56 '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime. gyp:sel',
57 'monacl_codegen',
57 ], 58 ],
58 }, 59 },
59 { 60 {
60 'target_name': 'monacl_shell', 61 'target_name': 'monacl_shell',
61 'type': 'executable', 62 'type': 'executable',
62 'dependencies': [ 63 'dependencies': [
63 '../base/base.gyp:base', 64 '../base/base.gyp:base',
64 'edk/mojo_edk.gyp:mojo_system_impl', 65 'edk/mojo_edk.gyp:mojo_system_impl',
65 'monacl_sel', 66 'monacl_sel',
66 ], 67 ],
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 '../testing/gtest_nacl.gyp:gtest_nacl', 113 '../testing/gtest_nacl.gyp:gtest_nacl',
113 '../testing/gtest_nacl.gyp:gtest_main_nacl', 114 '../testing/gtest_nacl.gyp:gtest_main_nacl',
114 'mojo_nacl', 115 'mojo_nacl',
115 'monacl_codegen', 116 'monacl_codegen',
116 ], 117 ],
117 }, 118 },
118 ], 119 ],
119 }], 120 }],
120 ], 121 ],
121 } 122 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698