diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 17:18:06 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 17:18:06 +0000 |
| commit | b5db700c4f0b93867f6aaf6c4c4ddbd2f1a3392d (patch) | |
| tree | 2e39bfd99ca5c590476a1885da4a56157424061b /chrome | |
| parent | d82be9ad77334a5076f7f7624fceaae3fbb1d250 (diff) | |
| download | chromium_src-b5db700c4f0b93867f6aaf6c4c4ddbd2f1a3392d.zip chromium_src-b5db700c4f0b93867f6aaf6c4c4ddbd2f1a3392d.tar.gz chromium_src-b5db700c4f0b93867f6aaf6c4c4ddbd2f1a3392d.tar.bz2 | |
Moves cros_api.gyp into Chrome. The current situation (cros_api.gyp
living in third_party/cros) won't work as the SConstruct file in
third_party/cros is different than the one Chrome wants (it's for the
Chrome OS side). As a result, when chrome gclient syncs it clobbers
third_party/cros/SConstruct and further syncs fail.
Review URL: http://codereview.chromium.org/487016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/cros_api.gyp | 17 | ||||
| -rwxr-xr-x | chrome/chrome_browser.gypi | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/cros_api.gyp b/chrome/browser/chromeos/cros_api.gyp new file mode 100644 index 0000000..a3d5fa71 --- /dev/null +++ b/chrome/browser/chromeos/cros_api.gyp @@ -0,0 +1,17 @@ +{ + 'targets': [ + { 'target_name': 'cros_api', + 'type': '<(library)', + 'sources': [ + '../../../third_party/cros/chromeos_power.h', + '../../../third_party/cros/chromeos_network.h', + '../../../third_party/cros/load.cc', + ], + 'include_dirs': [ + '../../../third_party/cros', + '../../../third_party', + '../../..', + ], + }, + ], + } diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index d54b044..1d61e32 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2302,7 +2302,7 @@ 'dependencies': [ '../third_party/protobuf2/protobuf.gyp:protobuf_lite', '../third_party/protobuf2/protobuf.gyp:protoc#host', - '../third_party/cros/cros_api.gyp:cros_api', + 'browser/chromeos/cros_api.gyp:cros_api', '../views/views.gyp:views', ], 'actions': [ |