Relocating files in the nacl repo that belong in chrome.

ppapi/native_client/native_client.gyp

Index: ppapi/native_client/native_client.gyp
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index cdace0892f17a1564bf5173441e081893abcb226..a9c3f5fc3410f423c633b23c9f38211dcd96e8ce 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -14,41 +14,58 @@
           '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',
               ],
             },
           ],