diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 22:38:35 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 22:38:35 +0000 |
| commit | bb8e56e24ead9449632837f4aa2b7a70f292fde3 (patch) | |
| tree | d93b0978cc31517add2691ac267ca91699d9b9c0 /ppapi | |
| parent | 4869742bbaf4bb6fed8a54d7751f442ab94a6a74 (diff) | |
| download | chromium_src-bb8e56e24ead9449632837f4aa2b7a70f292fde3.zip chromium_src-bb8e56e24ead9449632837f4aa2b7a70f292fde3.tar.gz chromium_src-bb8e56e24ead9449632837f4aa2b7a70f292fde3.tar.bz2 | |
Remove references to headers not in TC.
Currently we copy headers to a location in the toolchain during build
which do not actually belong there. This CL converts the toolchain
relative paths to NaCl repo relative in preparation for the removal
of those headers.
BUG= http://code.google.com/p/chromium/issues/detail?id=108503
TEST= try
Review URL: http://codereview.chromium.org/8949069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
5 files changed, 13 insertions, 11 deletions
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_audio.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_audio.h index 80ba67a..24048bb 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_audio.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_audio.h @@ -1,17 +1,17 @@ -// Copyright 2011 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. +// Copyright (c) 2011 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. #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_AUDIO_H_ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_AUDIO_H_ -#include <nacl/nacl_srpc.h> #include <pthread.h> #include "native_client/src/include/nacl_base.h" #include "native_client/src/include/nacl_macros.h" #include "native_client/src/include/portability.h" #include "native_client/src/include/ref_counted.h" #include "native_client/src/shared/ppapi_proxy/plugin_resource.h" +#include "native_client/src/shared/srpc/nacl_srpc.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/ppb_audio.h" diff --git a/ppapi/native_client/tests/ppapi_example_audio/audio.cc b/ppapi/native_client/tests/ppapi_example_audio/audio.cc index a9b5ac0..3567209 100644 --- a/ppapi/native_client/tests/ppapi_example_audio/audio.cc +++ b/ppapi/native_client/tests/ppapi_example_audio/audio.cc @@ -13,8 +13,7 @@ #include <cmath> #include <limits> #include <string> -#include <nacl/nacl_inttypes.h> - +#include "native_client/src/include/nacl/nacl_inttypes.h" #include "native_client/src/shared/ppapi_proxy/utility.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/native_client/tests/ppapi_simple_tests/audio.cc b/ppapi/native_client/tests/ppapi_simple_tests/audio.cc index 9aedcd4..8274f09 100644 --- a/ppapi/native_client/tests/ppapi_simple_tests/audio.cc +++ b/ppapi/native_client/tests/ppapi_simple_tests/audio.cc @@ -9,8 +9,9 @@ #include <limits> #include <string> -#include <nacl/nacl_check.h> -#include <nacl/nacl_log.h> +#include "native_client/src/shared/platform/nacl_check.h" +#include "native_client/src/shared/platform/nacl_log.h" + #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/native_client/tests/ppapi_simple_tests/file.cc b/ppapi/native_client/tests/ppapi_simple_tests/file.cc index 9ff87d3..3b3c2d8 100644 --- a/ppapi/native_client/tests/ppapi_simple_tests/file.cc +++ b/ppapi/native_client/tests/ppapi_simple_tests/file.cc @@ -10,7 +10,9 @@ #include <string> #include <queue> -#include <nacl/nacl_check.h> +#include "native_client/src/shared/platform/nacl_check.h" + + #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_io.h" diff --git a/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.cc b/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.cc index d0d4a00..600f0eb 100644 --- a/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.cc +++ b/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.cc @@ -9,8 +9,8 @@ #include <limits> #include <string> -#include <nacl/nacl_check.h> -#include <nacl/nacl_log.h> +#include "native_client/src/shared/platform/nacl_check.h" +#include "native_client/src/shared/platform/nacl_log.h" #include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_bool.h" |