diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 19:31:42 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 19:31:42 +0000 |
| commit | 98e1d8d1ae17738bf467f7619ab608c4e076d79a (patch) | |
| tree | f3a756061a04087567d067612c9bc11f820ad1cb | |
| parent | ceda581e4bef58107b6aa5c1dba572a6358c080a (diff) | |
| download | chromium_src-98e1d8d1ae17738bf467f7619ab608c4e076d79a.zip chromium_src-98e1d8d1ae17738bf467f7619ab608c4e076d79a.tar.gz chromium_src-98e1d8d1ae17738bf467f7619ab608c4e076d79a.tar.bz2 | |
Remove webview gyp time dependency on third_party/eyesfree
Android only gyp fix for webview. All trybots already passed compile step.
TBR=jam@chromium.org
NOTRY=true
BUG=
Review URL: https://chromiumcodereview.appspot.com/11576034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173188 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/content.gyp | 8 | ||||
| -rw-r--r-- | third_party/eyesfree/eyesfree.gyp | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/content/content.gyp b/content/content.gyp index d1aa165..e847463 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -284,7 +284,6 @@ 'dependencies': [ '../base/base.gyp:base', '../net/net.gyp:net', - '../third_party/eyesfree/eyesfree.gyp:eyesfree_java', '../ui/ui.gyp:ui_java', 'common_aidl', 'content_common', @@ -296,6 +295,13 @@ 'R_package': 'org.chromium.content', 'R_package_relpath': 'org/chromium/content', }, + 'conditions': [ + ['android_build_type == 0', { + 'dependencies': [ + '../third_party/eyesfree/eyesfree.gyp:eyesfree_java', + ], + }], + ], 'includes': [ '../build/java.gypi' ], }, { diff --git a/third_party/eyesfree/eyesfree.gyp b/third_party/eyesfree/eyesfree.gyp index 956737d..8bf14cb 100644 --- a/third_party/eyesfree/eyesfree.gyp +++ b/third_party/eyesfree/eyesfree.gyp @@ -3,7 +3,7 @@ # found in the LICENSE file. { 'conditions': [ - ['OS == "android"', { + ['OS == "android" and android_build_type == 0', { 'targets': [ { 'target_name': 'eyesfree_java', |