diff options
author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 01:00:21 +0000 |
---|---|---|
committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 01:00:21 +0000 |
commit | 1e40513cce7a4a1de6ccad42f13d77db0e313fde (patch) | |
tree | 0b02caff0d2bc7531220e8c0e23969dfc77a3975 /chrome/browser/chromeos/cros/cros_library_loader.cc | |
parent | af0b07937eb8c6faea00781ad36c4d5b5acedff6 (diff) | |
download | chromium_src-1e40513cce7a4a1de6ccad42f13d77db0e313fde.zip chromium_src-1e40513cce7a4a1de6ccad42f13d77db0e313fde.tar.gz chromium_src-1e40513cce7a4a1de6ccad42f13d77db0e313fde.tar.bz2 |
Checking in CL http://www.codereview.chromium.org/2836058 on behalf of zbehan@:
chrome: create an option for using libcros provided by the system; fix all
includes referring to libcros to not include third_party/
* Headers fix is needed to support using system libcros (installed to /usr/include)
* All includes are "", and therefore a local variant in third_party/cros/ is
always preferred, but system will also get picked up as a secondary target
* Fixed chrome/browser/chromeos/cros/synaptics_library.h comments to better
reflect the header placement
* Added a variable system_libcros defaulting to 0
* Gotten rid of duplicate cros_api.gyp
* Changed both places to either link against cros_api or libcrosapi
TEST=build in the following scenarios:
1) libcros not installed, libcros sources in third_party/, !defined system_libcros
- sucess
2) installed libcros, put #error into /usr/include/cros/chromeos_cros_api.h, repeat 1)
- success
3) BUILD_DEFINES+=system_libcros=1, removed libcros from third_party, repeat 2)
- fail (on #error in chromeos_cros_api.h)
4) Installed clean libcros, repeat 3)
- success
Review URL: http://codereview.chromium.org/3043010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros/cros_library_loader.cc')
-rw-r--r-- | chrome/browser/chromeos/cros/cros_library_loader.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/cros/cros_library_loader.cc b/chrome/browser/chromeos/cros/cros_library_loader.cc index d53d187..a542802 100644 --- a/chrome/browser/chromeos/cros/cros_library_loader.cc +++ b/chrome/browser/chromeos/cros/cros_library_loader.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" -#include "third_party/cros/chromeos_cros_api.h" +#include "cros/chromeos_cros_api.h" namespace chromeos { |