Put various nacl headers back under nacl/ where they have previously been

native_client_sdk/src/build_tools/buildbot_run.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Entry point for both build and try bots'''
 
 import build_utils
 import lastchange
 import os
@@ skipping 161 matching lines @@
   args = [scons, mode, plat, bin, lib, '-j10',
           'install_bin', 'install_lib']
   if tcname == 'glibc':
     args.append('--nacl_glibc')
   return args
 
 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',
   },
 }
 
 
 def InstallHeaders(tc_dst_inc, pepper_ver, tc_name):
   """Copies NaCl headers to expected locations in the toolchain."""
   tc_map = header_map[tc_name]
   for filename in tc_map:
     src = os.path.join(NACL_DIR, tc_map[filename])
     dst = os.path.join(tc_dst_inc, filename)
+    if not os.path.exists(os.path.dirname(dst)):

[noelallen1, 2012/01/31 23:57:14]

Shouldn't need the exists check, MakeDir uses '-p'

+      MakeDir(os.path.dirname(dst))
     oshelpers.Copy(['-v', src, dst])
 
   # Clean out per toolchain ppapi directory
   ppapi = os.path.join(tc_dst_inc, 'ppapi')
   RemoveDir(ppapi)
 
   # Copy in c and c/dev headers
   MakeDir(os.path.join(ppapi, 'c', 'dev'))
   CopyDir(os.path.join(PPAPI_DIR, 'c', '*.h'),
           os.path.join(ppapi, 'c'))
@@ skipping 158 matching lines @@
           AddMakeBat(dirnode)
         print "\n\nMake: " + dirnode
         Run(['make', 'all', '-j8'], cwd=os.path.abspath(dirnode), shell=True)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())