Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Unified Diff: ui/gfx/gfx_nacl.gyp

Issue 2104403003: pepper: parse context creation attrib list on the plugin side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gpu_pref_size_in_attrs
Patch Set: rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/gfx_geometry.gypi ('k') | ui/gfx/ipc/geometry/gfx_ipc_geometry.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..56b499bf6325dea54c51beadea912276d40f3cd5 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 2016 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': {
+ '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',
],
},
],
« no previous file with comments | « ui/gfx/gfx_geometry.gypi ('k') | ui/gfx/ipc/geometry/gfx_ipc_geometry.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698