diff options
10 files changed, 14 insertions, 14 deletions
diff --git a/ppapi/native_client/src/untrusted/irt_stub/plugin_main_irt.c b/ppapi/native_client/src/untrusted/irt_stub/plugin_main_irt.c index 95f9c5d..5975be0 100644 --- a/ppapi/native_client/src/untrusted/irt_stub/plugin_main_irt.c +++ b/ppapi/native_client/src/untrusted/irt_stub/plugin_main_irt.c @@ -4,7 +4,7 @@ * found in the LICENSE file. */ -#include "native_client/src/shared/ppapi_proxy/ppruntime.h" +#include "ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h" /* * An application that doesn't define its own main but links in -lppapi diff --git a/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_main.c b/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_main.c index acc6de7..3d50738 100644 --- a/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_main.c +++ b/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_main.c @@ -4,7 +4,7 @@ * found in the LICENSE file. */ -#include "native_client/src/untrusted/irt_stub/ppapi_start.h" +#include "ppapi/native_client/src/untrusted/irt_stub/ppapi_start.h" /* * These are dangling references to functions that the application must define. diff --git a/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_start.c b/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_start.c index af5bf86..64f8802 100644 --- a/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_start.c +++ b/ppapi/native_client/src/untrusted/irt_stub/ppapi_plugin_start.c @@ -8,12 +8,12 @@ #include <string.h> #include <unistd.h> -#include "native_client/src/include/elf_auxv.h" #include "native_client/src/include/elf32.h" -#include "native_client/src/shared/ppapi_proxy/ppruntime.h" +#include "native_client/src/include/elf_auxv.h" #include "native_client/src/untrusted/irt/irt.h" #include "native_client/src/untrusted/irt/irt_ppapi.h" -#include "native_client/src/untrusted/irt_stub/thread_creator.h" +#include "ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h" +#include "ppapi/native_client/src/untrusted/irt_stub/thread_creator.h" static void fatal_error(const char *message) { write(2, message, strlen(message)); diff --git a/ppapi/native_client/src/untrusted/irt_stub/thread_creator.c b/ppapi/native_client/src/untrusted/irt_stub/thread_creator.c index 6291316..d70186d 100644 --- a/ppapi/native_client/src/untrusted/irt_stub/thread_creator.c +++ b/ppapi/native_client/src/untrusted/irt_stub/thread_creator.c @@ -4,7 +4,7 @@ * found in the LICENSE file. */ -#include "native_client/src/untrusted/irt_stub/thread_creator.h" +#include "ppapi/native_client/src/untrusted/irt_stub/thread_creator.h" #include <pthread.h> diff --git a/ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.cc b/ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.cc index 3808064..93b2bac 100644 --- a/ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.cc +++ b/ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.cc @@ -4,11 +4,11 @@ * found in the LICENSE file. */ -#include "native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h" +#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h" // TODO(bsy): move weak_ref module to the shared directory #include "native_client/src/trusted/weak_ref/weak_ref.h" -#include "native_client/src/trusted/weak_ref/call_on_main_thread.h" +#include "ppapi/native_client/src/trusted/weak_ref/call_on_main_thread.h" namespace nacl_ppapi { diff --git a/ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h b/ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h index f98baa4..bbfd8ba 100644 --- a/ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h +++ b/ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h @@ -20,7 +20,7 @@ // TODO(bsy): move weak_ref module to the shared directory #include "native_client/src/trusted/weak_ref/weak_ref.h" -#include "native_client/src/trusted/weak_ref/call_on_main_thread.h" +#include "ppapi/native_client/src/trusted/weak_ref/call_on_main_thread.h" // The nomenclature used in this file is intended to clarify thinking // about the Pepper "main thread". The "main thread" is really an diff --git a/ppapi/native_client/src/untrusted/nacl_ppapi_util/ppapi_srpc_main.c b/ppapi/native_client/src/untrusted/nacl_ppapi_util/ppapi_srpc_main.c index 909ecf7..92898a6 100644 --- a/ppapi/native_client/src/untrusted/nacl_ppapi_util/ppapi_srpc_main.c +++ b/ppapi/native_client/src/untrusted/nacl_ppapi_util/ppapi_srpc_main.c @@ -5,7 +5,7 @@ */ #include "native_client/src/shared/srpc/nacl_srpc.h" -#include "native_client/src/untrusted/nacl_ppapi_util/ppapi_srpc_main.h" +#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/ppapi_srpc_main.h" /* * Here be dragons. Beware. diff --git a/ppapi/native_client/src/untrusted/nacl_ppapi_util/string_buffer.cc b/ppapi/native_client/src/untrusted/nacl_ppapi_util/string_buffer.cc index fcf3a5e..6964bbd 100644 --- a/ppapi/native_client/src/untrusted/nacl_ppapi_util/string_buffer.cc +++ b/ppapi/native_client/src/untrusted/nacl_ppapi_util/string_buffer.cc @@ -6,7 +6,7 @@ #include <stdarg.h> -#include "native_client/src/untrusted/nacl_ppapi_util/string_buffer.h" +#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/string_buffer.h" namespace nacl { diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c index e143c92..4c93c9e 100644 --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c @@ -7,8 +7,8 @@ #include "native_client/src/include/elf32.h" #include "native_client/src/include/elf_auxv.h" #include "native_client/src/include/nacl_macros.h" -#include "native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h" #include "native_client/src/untrusted/nacl/nacl_startup.h" +#include "ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h" /* diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.c index 2d8466c..bace426 100644 --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.c +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.c @@ -4,13 +4,13 @@ * found in the LICENSE file. */ -#include "native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h" +#include "ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h" #include <string.h> -#include "native_client/src/shared/ppapi_proxy/ppruntime.h" #include "native_client/src/untrusted/irt/irt.h" #include "native_client/src/untrusted/irt/irt_ppapi.h" #include "ppapi/generators/pnacl_shim.h" +#include "ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h" /* Use local strcmp to avoid dependency on libc. */ static int mystrcmp(const char* s1, const char *s2) { |