From e76045323aeb26e34df7bb36ea2d09d4f3adfcaa Mon Sep 17 00:00:00 2001 From: "vsm@google.com" Date: Tue, 22 Jan 2013 16:28:13 +0000 Subject: [PATCH] Merge the openglui samples into one. This also re-enables building the emulator sample. Review URL: https://codereview.chromium.org//12021025 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@17409 260f80e4-7a28-3924-810f-c04153c831b5 --- dart.gyp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dart.gyp b/dart.gyp index 49785902093..d206fccbe4e 100644 --- a/dart.gyp +++ b/dart.gyp @@ -116,20 +116,11 @@ { 'target_name': 'samples', 'type': 'none', + 'dependencies': [ + 'samples/openglui/openglui.gyp:openglui_sample', + ], 'conditions': [ - ['OS=="android"', { - 'dependencies': [ - 'samples/android_sample/android_sample.gyp:android_sample', - ], - }, - ], - ['OS=="win"', { - 'dependencies': [ - 'samples/sample_extension/sample_extension.gyp:sample_extension', - ], - }, - ], - ['OS=="mac" or OS=="linux"', { + ['OS!="android"', { 'dependencies': [ 'samples/sample_extension/sample_extension.gyp:sample_extension', ],