Relocating files in the nacl repo that belong in chrome.

ppapi/native_client/native_client.gyp

 # 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.
 
 {
   'includes': [
     '../../build/common_untrusted.gypi',
   ],
   'conditions': [
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
           'target_name': 'ppapi_lib',
           'type': 'none',
           'dependencies': [
              '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
-             '../../native_client/src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub_lib',
+             'src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub_lib',
           ],
-          # Here we copy linker scripts out of the Native Client repository.
-          # These are source, not build artifacts.
           'copies': [
+            # TODO(bradnelson): enable on DEPS roll once corresponding nacl
+            # side copy has been removed.
+            #{
+            #  'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include/nacl',

[Nick Bray, 2012/09/06 17:11:58]

Don't put this in here if it's dead?

[bradn, 2012/09/06 18:53:16]

Done.

+            #  'files': [
+            #      'src/trusted/weak_ref/call_on_main_thread.h',
+            #      'src/shared/ppapi_proxy/ppruntime.h',
+            #  ],
+            #},
+            #{
+            #  'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include/nacl',
+            #  'files': [
+            #      'src/trusted/weak_ref/call_on_main_thread.h',
+            #      'src/shared/ppapi_proxy/ppruntime.h',
+            #  ],
+            #},
+
+            # Here we copy linker scripts out of the Native Client repository.
+            # These are source, not build artifacts.
             {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32',
               'files': [
-                  '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a',
+                  'src/untrusted/irt_stub/libppapi.a',
               ],
             },
             {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64',
               'files': [
-                  '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a',
+                  'src/untrusted/irt_stub/libppapi.a',
               ],
             },
             {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
               'files': [
-                  '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a',
-                  '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.so',
+                  'src/untrusted/irt_stub/libppapi.a',
+                  'src/untrusted/irt_stub/libppapi.so',
               ],
             },
             {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',
               'files': [
-                  '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a',
-                  '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.so',
+                  'src/untrusted/irt_stub/libppapi.a',
+                  'src/untrusted/irt_stub/libppapi.so',
               ],
             },
             {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
               'files': [
-                '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a',
+                'src/untrusted/irt_stub/libppapi.a',
               ],
             },
           ],
         },
         {
           'target_name': 'nacl_irt',
           'type': 'none',
           'variables': {
             'nexe_target': 'nacl_irt',
             # These out_* fields override the default filenames, which
@@ skipping 353 matching lines @@
             '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
             '../../native_client/src/shared/platform/platform.gyp:platform_lib',
             '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
             '../../native_client/src/shared/gio/gio.gyp:gio_lib',
           ],
         },
       ],
     }],
   ],
 }