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

1 files changed, 17 insertions, 1 deletions

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 57e2996..c25182b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3517,7 +3517,23 @@
                 '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
                 #'../third_party/protobuf2/protobuf.gyp:protobuf',
                 '../third_party/protobuf2/protobuf.gyp:protoc#host',
-                '../third_party/cros/cros_api.gyp:cros_api',
+              ],
+              'conditions': [
+                ['system_libcros==0', {
+                  'dependencies': [
+                    '../third_party/cros/cros_api.gyp:cros_api',
+                  ],
+                  'include_dirs': [
+                    '../third_party/'
+                  ],
+                }],
+                ['system_libcros==1', {
+                  'link_settings': {
+                    'libraries': [
+                      '-lcrosapi',
+                    ],
+                  },
+                }],
               ],
               'actions': [
                 {