Merge from Chromium at DEPS revision r167172
This commit was generated by merge_to_master.py.
Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
diff --git a/gpu/command_buffer/command_buffer_untrusted.gyp b/gpu/command_buffer/command_buffer_untrusted.gyp
new file mode 100644
index 0000000..553af5a
--- /dev/null
+++ b/gpu/command_buffer/command_buffer_untrusted.gyp
@@ -0,0 +1,34 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ 'variables': {
+ 'chromium_code': 1,
+ },
+ 'includes': [
+ '../../build/common_untrusted.gypi',
+ 'command_buffer.gypi',
+ ],
+ 'conditions': [
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ 'targets': [
+ {
+ 'target_name': 'gles2_utils_untrusted',
+ 'type': 'none',
+ 'variables': {
+ 'gles2_utils_target': 1,
+ 'nacl_untrusted_build': 1,
+ 'nlib_target': 'libgles2_utils_untrusted.a',
+ 'build_glibc': 0,
+ 'build_newlib': 1,
+ },
+ 'dependencies': [
+ '../../native_client/tools.gyp:prep_toolchain',
+ '../../base/base_untrusted.gyp:base_untrusted',
+ ],
+ },
+ ],
+ }],
+ ],
+}