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

Side by Side Diff: ppapi/native_client/native_client.gyp

Issue 10909178: NaCl: Update revision in DEPS, r9652 -> r9707 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Apply fix Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | 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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'includes': [ 6 'includes': [
7 '../../build/common_untrusted.gypi', 7 '../../build/common_untrusted.gypi',
8 ], 8 ],
9 'conditions': [ 9 'conditions': [
10 ['disable_nacl==0 and disable_nacl_untrusted==0', { 10 ['disable_nacl==0 and disable_nacl_untrusted==0', {
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'ppapi_lib', 13 'target_name': 'ppapi_lib',
14 'type': 'none', 14 'type': 'none',
15 'dependencies': [ 15 'dependencies': [
16 '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib' , 16 '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib' ,
17 'src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub_lib', 17 'src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub_lib',
18 ], 18 ],
19 'include_dirs': [ 19 'include_dirs': [
20 '..', 20 '..',
21 ], 21 ],
22 'copies': [ 22 'copies': [
23 # TODO(bradnelson): Re-enable on nacl DEPS roll. 23 {
24 #{ 24 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include/nacl' ,
25 # 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include/nacl ', 25 'files': [
26 # 'files': [ 26 'src/trusted/weak_ref/call_on_main_thread.h',
27 # 'src/trusted/weak_ref/call_on_main_thread.h', 27 'src/shared/ppapi_proxy/ppruntime.h',
28 # 'src/shared/ppapi_proxy/ppruntime.h', 28 ],
29 # ], 29 },
30 #}, 30 {
31 #{ 31 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include/nacl',
32 # 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include/nacl' , 32 'files': [
33 # 'files': [ 33 'src/trusted/weak_ref/call_on_main_thread.h',
34 # 'src/trusted/weak_ref/call_on_main_thread.h', 34 'src/shared/ppapi_proxy/ppruntime.h',
35 # 'src/shared/ppapi_proxy/ppruntime.h', 35 ],
36 # ], 36 },
37 #},
38 # Here we copy linker scripts out of the Native Client repository. 37 # Here we copy linker scripts out of the Native Client repository.
39 # These are source, not build artifacts. 38 # These are source, not build artifacts.
40 { 39 {
41 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32', 40 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32',
42 'files': [ 41 'files': [
43 'src/untrusted/irt_stub/libppapi.a', 42 'src/untrusted/irt_stub/libppapi.a',
44 ], 43 ],
45 }, 44 },
46 { 45 {
47 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64', 46 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64',
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', 432 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
434 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 433 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
435 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 434 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
436 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 435 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
437 ], 436 ],
438 }, 437 },
439 ], 438 ],
440 }], 439 }],
441 ], 440 ],
442 } 441 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698