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 /build | |
| 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 'build')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 8a9fd97..3026274 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -15,6 +15,11 @@ 'internal_pdf%': 0, + # This allows to use libcros from the current system, ie. /usr/lib/ + # The cros_api will be pulled in as a static library, and all headers + # from the system include dirs. + 'system_libcros%': '0', + # Variables expected to be overriden on the GYP command line (-D) or by # ~/.gyp/include.gypi. |