From 16348bb421b9a2dcd2b4d379cfb92b5d46216088 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 29 Apr 2014 00:38:39 +0000 Subject: [PATCH] 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@14426 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/views.gyp | 1 - gyp/views_animated.gyp | 1 - 2 files changed, 2 deletions(-) diff --git a/gyp/views.gyp b/gyp/views.gyp index b94061a17d..6db85df2bd 100644 --- a/gyp/views.gyp +++ b/gyp/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/gyp/views_animated.gyp b/gyp/views_animated.gyp index 01ec4fa643..c10e9f75b2 100644 --- a/gyp/views_animated.gyp +++ b/gyp/views_animated.gyp @@ -7,7 +7,6 @@ 'type': 'static_library', 'dependencies': [ 'skia_lib.gyp:skia_lib', - 'angle.gyp:*', 'animator.gyp:*', 'views.gyp:*', 'xml.gyp:*',