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

Side by Side Diff: gyp/common_variables.gypi

Issue 2282733003: Update ANGLE to latest as of August 25, 2016 (Closed)
Patch Set: Rebase? Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « DEPS ('k') | src/gpu/gl/GrGLCaps.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 The Android Open Source Project 1 # Copyright 2012 The Android Open Source Project
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 # Get ready for the ugly... 7 # Get ready for the ugly...
8 # 8 #
9 # - We have to nest our variables dictionaries multiple levels deep, so that 9 # - We have to nest our variables dictionaries multiple levels deep, so that
10 # this and other gyp files can rely on previously-set variable values in 10 # this and other gyp files can rely on previously-set variable values in
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 # Re-define all variables defined within the level-3 'variables' dict, 69 # Re-define all variables defined within the level-3 'variables' dict,
70 # so that siblings of the level-2 'variables' dict can see them. 70 # so that siblings of the level-2 'variables' dict can see them.
71 # (skia_os will depend on skia_android_framework.) 71 # (skia_os will depend on skia_android_framework.)
72 'skia_android_framework%': '<(skia_android_framework)', 72 'skia_android_framework%': '<(skia_android_framework)',
73 'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)', 73 'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)',
74 'skia_arch_type%': '<(skia_arch_type)', 74 'skia_arch_type%': '<(skia_arch_type)',
75 'arm_version%': '<(arm_version)', 75 'arm_version%': '<(arm_version)',
76 'arm_neon%': '<(arm_neon)', 76 'arm_neon%': '<(arm_neon)',
77 'skia_egl%': '<(skia_egl)', 77 'skia_egl%': '<(skia_egl)',
78 'use_ozone%': 0, # ANGLE requires this to be defined.
78 'vulkan_merged_into_skia%': '<(vulkan_merged_into_skia)', 79 'vulkan_merged_into_skia%': '<(vulkan_merged_into_skia)',
79 'conditions': [ 80 'conditions': [
80 [ 'skia_android_framework == 1', { 81 [ 'skia_android_framework == 1', {
81 'skia_os%': 'android', 82 'skia_os%': 'android',
82 'skia_chrome_utils%': 0, 83 'skia_chrome_utils%': 0,
83 'skia_use_android_framework_defines%': 1, 84 'skia_use_android_framework_defines%': 1,
84 'skia_use_system_json%': 1, 85 'skia_use_system_json%': 1,
85 'skia_vulkan%': 1, 86 'skia_vulkan%': 1,
86 'skia_vulkan_debug_layers%': 0, 87 'skia_vulkan_debug_layers%': 0,
87 }, { 88 }, {
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 #'-flto' # Enable link-time optimization. 256 #'-flto' # Enable link-time optimization.
256 ], 257 ],
257 'skia_experimental_shadowing': 0, # for experimental shadow-drawing 258 'skia_experimental_shadowing': 0, # for experimental shadow-drawing
258 259
259 # These are referenced by our .gypi files that list files (e.g. core.gypi) 260 # These are referenced by our .gypi files that list files (e.g. core.gypi)
260 # 261 #
261 'skia_src_path%': '../src', 262 'skia_src_path%': '../src',
262 'skia_include_path%': '../include', 263 'skia_include_path%': '../include',
263 }, 264 },
264 } 265 }
OLDNEW
« no previous file with comments | « DEPS ('k') | src/gpu/gl/GrGLCaps.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698