From 1e40513cce7a4a1de6ccad42f13d77db0e313fde Mon Sep 17 00:00:00 2001 From: "zelidrag@chromium.org" Date: Thu, 22 Jul 2010 01:00:21 +0000 Subject: 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 --- build/common.gypi | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'build/common.gypi') 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. -- cgit v1.1