Chromium Code Reviews| Index: ui/gfx/gfx_nacl.gyp |
| diff --git a/gpu/command_buffer/command_buffer_nacl.gyp b/ui/gfx/gfx_nacl.gyp |
| similarity index 68% |
| copy from gpu/command_buffer/command_buffer_nacl.gyp |
| copy to ui/gfx/gfx_nacl.gyp |
| index e05899968cf483ce2d4e791c8cdfbae7e55bc422..fda5b581defbb4038f8009ab5ddbcc9130c35970 100644 |
| --- a/gpu/command_buffer/command_buffer_nacl.gyp |
| +++ b/ui/gfx/gfx_nacl.gyp |
| @@ -1,25 +1,25 @@ |
| -# Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| +# Copyright (c) 2013 The Chromium Authors. All rights reserved. |
|
danakj
2016/07/01 20:35:40
dittos
piman
2016/07/06 18:34:24
Done.
|
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| { |
| - 'variables': { |
| + 'variables': { |
| 'chromium_code': 1, |
| + # nacl_win64_target is for building the trusted Win64 NaCl broker. |
| + 'nacl_win64_target': 0, |
| }, |
| 'includes': [ |
| '../../build/common_untrusted.gypi', |
| - 'command_buffer.gypi', |
| ], |
| 'conditions': [ |
| ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 'targets': [ |
| { |
| - 'target_name': 'gles2_utils_nacl', |
| + 'target_name': 'gfx_geometry_nacl', |
| 'type': 'none', |
| 'variables': { |
| - 'gles2_utils_target': 1, |
| 'nacl_untrusted_build': 1, |
| - 'nlib_target': 'libgles2_utils_nacl.a', |
| + 'nlib_target': 'libgfx_geometry_nacl.a', |
| 'build_glibc': 0, |
| 'build_newlib': 0, |
| 'build_irt': 1, |
| @@ -29,7 +29,9 @@ |
| 'dependencies': [ |
| '../../base/base_nacl.gyp:base_nacl', |
| '../../base/base_nacl.gyp:base_nacl_nonsfi', |
| - '../../third_party/khronos/khronos.gyp:khronos_headers', |
| + ], |
| + 'includes': [ |
| + 'gfx_geometry.gypi', |
| ], |
| }, |
| ], |