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

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

Issue 10914053: Relocating files in the nacl repo that belong in chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 '../../native_client/src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub _lib', 17 'src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub_lib',
18 ], 18 ],
19 # Here we copy linker scripts out of the Native Client repository. 19 # Here we copy linker scripts out of the Native Client repository.
20 # These are source, not build artifacts. 20 # These are source, not build artifacts.
21 'copies': [ 21 'copies': [
22 { 22 {
23 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32', 23 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32',
24 'files': [ 24 'files': [
25 '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a', 25 'src/untrusted/irt_stub/libppapi.a',
26 ], 26 ],
27 }, 27 },
28 { 28 {
29 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64', 29 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64',
30 'files': [ 30 'files': [
31 '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a', 31 'src/untrusted/irt_stub/libppapi.a',
32 ], 32 ],
33 }, 33 },
34 { 34 {
35 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32', 35 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
36 'files': [ 36 'files': [
37 '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a', 37 'src/untrusted/irt_stub/libppapi.a',
38 '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.so', 38 'src/untrusted/irt_stub/libppapi.so',
39 ], 39 ],
40 }, 40 },
41 { 41 {
42 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64', 42 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',
43 'files': [ 43 'files': [
44 '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a', 44 'src/untrusted/irt_stub/libppapi.a',
45 '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.so', 45 'src/untrusted/irt_stub/libppapi.so',
46 ], 46 ],
47 }, 47 },
48 { 48 {
49 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm', 49 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
50 'files': [ 50 'files': [
51 '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a', 51 'src/untrusted/irt_stub/libppapi.a',
52 ], 52 ],
53 }, 53 },
54 ], 54 ],
55 }, 55 },
56 { 56 {
57 'target_name': 'nacl_irt', 57 'target_name': 'nacl_irt',
58 'type': 'none', 58 'type': 'none',
59 'variables': { 59 'variables': {
60 'nexe_target': 'nacl_irt', 60 'nexe_target': 'nacl_irt',
61 # These out_* fields override the default filenames, which 61 # These out_* fields override the default filenames, which
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', 415 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
416 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 416 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
417 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 417 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
418 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 418 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
419 ], 419 ],
420 }, 420 },
421 ], 421 ],
422 }], 422 }],
423 ], 423 ],
424 } 424 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698