summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-29 00:38:39 +0000
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-29 00:38:39 +0000
commit8ecee3cd6742fa45e097e49fae4bb55d398b706d (patch)
tree37b7d86fecb8e99b7f1a17e68a39fcda5ecc8970
parent0e5097beb6e2a8c53aa931a2937654b6d27cc00c (diff)
downloadgyp-8ecee3cd6742fa45e097e49fae4bb55d398b706d.tar.gz
Remove dependency of views on angle
Just like with http://code.google.com/p/skia/source/detail?r=13618, listing angle.gyp as a dependency when in the Android tree (i.e. w/o third_party/externals) causes gyp_to_android.py to fail. (See http://108.170.220.27:10115/builders/Housekeeper-PerCommit-AndroidRoll/builds/229/steps/Merge/logs/stdio for example failure.) Fortunately, views (and views_animated) has no need to depend directly on angle. R=bungeman@google.com, bsalomon@google.com, robertphillips@google.com TBR=bsalomon@google.com BUG=skia:2447 Author: scroggo@google.com Review URL: https://codereview.chromium.org/253773004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14426 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--views.gyp1
-rw-r--r--views_animated.gyp1
2 files changed, 0 insertions, 2 deletions
diff --git a/views.gyp b/views.gyp
index b94061a..6db85df 100644
--- a/views.gyp
+++ b/views.gyp
@@ -13,7 +13,6 @@
'standalone_static_library': 1,
'dependencies': [
'skia_lib.gyp:skia_lib',
- 'angle.gyp:*',
'xml.gyp:*',
],
'include_dirs': [
diff --git a/views_animated.gyp b/views_animated.gyp
index 01ec4fa..c10e9f7 100644
--- a/views_animated.gyp
+++ b/views_animated.gyp
@@ -7,7 +7,6 @@
'type': 'static_library',
'dependencies': [
'skia_lib.gyp:skia_lib',
- 'angle.gyp:*',
'animator.gyp:*',
'views.gyp:*',
'xml.gyp:*',