diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 18:46:39 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 18:46:39 +0000 |
| commit | 39a55d6e5f025c6acb9501ab0f3555f30e96f19b (patch) | |
| tree | 213637be5e38e41ed00536f9d9b02d4d39c0634c | |
| parent | d78d736fa0f2b999a867aecc1bbde73d157a605a (diff) | |
| download | chromium_src-39a55d6e5f025c6acb9501ab0f3555f30e96f19b.zip chromium_src-39a55d6e5f025c6acb9501ab0f3555f30e96f19b.tar.gz chromium_src-39a55d6e5f025c6acb9501ab0f3555f30e96f19b.tar.bz2 | |
Fix misplaced libusb dependency exclusion.
The line was added when we upstream Android changes but misplaced in a condition about safe_browsing. Exclude libusb on Android and IOS in right way.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11593022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173961 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_browser.gypi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 19f978d..b453d82 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -43,7 +43,6 @@ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', - '../third_party/libusb/libusb.gyp:libusb', '../third_party/libxml/libxml.gyp:libxml', '../third_party/zlib/zlib.gyp:minizip', '../third_party/zlib/zlib.gyp:zlib', @@ -2238,6 +2237,7 @@ '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', + '../third_party/libusb/libusb.gyp:libusb', '../third_party/npapi/npapi.gyp:npapi', '../third_party/re2/re2.gyp:re2', '../ui/gl/gl.gyp:gl', @@ -2387,7 +2387,6 @@ ], 'dependencies!': [ 'safe_browsing_proto', - '../third_party/libusb/libusb.gyp:libusb', ], 'sources!': [ 'browser/renderer_host/safe_browsing_resource_throttle.cc', @@ -2421,7 +2420,6 @@ 'dependencies!': [ 'safe_browsing_proto', 'safe_browsing_report_proto', - '../third_party/libusb/libusb.gyp:libusb', ], 'sources!': [ 'browser/renderer_host/safe_browsing_resource_throttle.cc', @@ -2731,6 +2729,9 @@ '../content/content.gyp:web_contents_delegate_android', 'chrome_browser_jni_headers', ], + 'dependencies!': [ + '../third_party/libusb/libusb.gyp:libusb', + ], 'sources': [ 'browser/sessions/in_memory_tab_restore_service.cc', 'browser/sessions/in_memory_tab_restore_service.h', |