summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorelijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-01 05:19:16 +0000
committerelijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-01 05:19:16 +0000
commit2ebc3d5c29442a7cc76e7363a89fff606ddabba6 (patch)
tree61917f865abb23392ad6c9de40e0dfe0d14a8fd8 /native_client_sdk
parentd2840ef6903b4b7faab74e90de656d3381eab588 (diff)
downloadchromium_src-2ebc3d5c29442a7cc76e7363a89fff606ddabba6.zip
chromium_src-2ebc3d5c29442a7cc76e7363a89fff606ddabba6.tar.gz
chromium_src-2ebc3d5c29442a7cc76e7363a89fff606ddabba6.tar.bz2
Put various nacl headers back under nacl/ where they have previously been
BUG=none TEST=trybots,manual (build SDK, inspect headers) Review URL: http://codereview.chromium.org/9309012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rwxr-xr-xnative_client_sdk/src/build_tools/buildbot_run.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py
index 7f12ab3..d95dadc 100755
--- a/native_client_sdk/src/build_tools/buildbot_run.py
+++ b/native_client_sdk/src/build_tools/buildbot_run.py
@@ -179,21 +179,21 @@ header_map = {
'newlib': {
'pthread.h': 'src/untrusted/pthread/pthread.h',
'semaphore.h': 'src/untrusted/pthread/semaphore.h',
- 'dynamic_annotations.h': 'src/untrusted/valgrind/dynamic_annotations.h',
- 'dynamic_annotations.h': 'src/untrusted/valgrind/dynamic_annotations.h',
- 'nacl_dyncode.h': 'src/untrusted/nacl/nacl_dyncode.h',
- 'nacl_startup.h': 'src/untrusted/nacl/nacl_startup.h',
- 'nacl_thread.h': 'src/untrusted/nacl/nacl_thread.h',
+ 'nacl/dynamic_annotations.h':
+ 'src/untrusted/valgrind/dynamic_annotations.h',
+ 'nacl/nacl_dyncode.h': 'src/untrusted/nacl/nacl_dyncode.h',
+ 'nacl/nacl_startup.h': 'src/untrusted/nacl/nacl_startup.h',
+ 'nacl/nacl_thread.h': 'src/untrusted/nacl/nacl_thread.h',
'pnacl.h': 'src/untrusted/nacl/pnacl.h',
'irt.h': 'src/untrusted/irt/irt.h',
'irt_ppapi.h': 'src/untrusted/irt/irt_ppapi.h',
},
'glibc': {
- 'dynamic_annotations.h': 'src/untrusted/valgrind/dynamic_annotations.h',
- 'dynamic_annotations.h': 'src/untrusted/valgrind/dynamic_annotations.h',
- 'nacl_dyncode.h': 'src/untrusted/nacl/nacl_dyncode.h',
- 'nacl_startup.h': 'src/untrusted/nacl/nacl_startup.h',
- 'nacl_thread.h': 'src/untrusted/nacl/nacl_thread.h',
+ 'nacl/dynamic_annotations.h':
+ 'src/untrusted/valgrind/dynamic_annotations.h',
+ 'nacl/nacl_dyncode.h': 'src/untrusted/nacl/nacl_dyncode.h',
+ 'nacl/nacl_startup.h': 'src/untrusted/nacl/nacl_startup.h',
+ 'nacl/nacl_thread.h': 'src/untrusted/nacl/nacl_thread.h',
'pnacl.h': 'src/untrusted/nacl/pnacl.h',
'irt.h': 'src/untrusted/irt/irt.h',
'irt_ppapi.h': 'src/untrusted/irt/irt_ppapi.h',
@@ -207,6 +207,7 @@ def InstallHeaders(tc_dst_inc, pepper_ver, tc_name):
for filename in tc_map:
src = os.path.join(NACL_DIR, tc_map[filename])
dst = os.path.join(tc_dst_inc, filename)
+ MakeDir(os.path.dirname(dst))
oshelpers.Copy(['-v', src, dst])
# Clean out per toolchain ppapi directory