gyp/common_variables.gypi - Issue 25564003: skia/trunk changes for generic sanitizer gyp flag.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gyp/common_variables.gypi

Issue 25564003: skia/trunk changes for generic sanitizer gyp flag. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: borenet Created 7 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:

Index: gyp/common_variables.gypi

diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi

index 3f7b154b6f94781f014501e7a8984229dd4a5fa0..9aeee62f9d662377fced72637906842aa47658da 100644

--- a/gyp/common_variables.gypi

+++ b/gyp/common_variables.gypi

@@ -78,8 +78,7 @@

}],

- 'skia_asan_build%': 0,

- 'skia_tsan_build%': 0,

+ 'skia_sanitizer%': '',

'skia_scalar%': 'float',

'skia_mesa%': 0,

'skia_nv_path_rendering%': 0,

@@ -119,7 +118,7 @@

}, {

'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)',

}],

- [ 'skia_asan_build or skia_tsan_build', {

+ [ 'skia_sanitizer', {

'skia_clang_build': 1,

}, {

'skia_clang_build%': 0,

@@ -133,8 +132,7 @@

'arm_neon_optional%': 0,

'skia_os%': '<(skia_os)',

'os_posix%': '<(os_posix)',

- 'skia_asan_build%': '<(skia_asan_build)',

- 'skia_tsan_build%': '<(skia_tsan_build)',

+ 'skia_sanitizer%': '<(skia_sanitizer)',

'skia_scalar%': '<(skia_scalar)',

'skia_mesa%': '<(skia_mesa)',

'skia_nv_path_rendering%': '<(skia_nv_path_rendering)',

« no previous file with comments | « gyp/common_conditions.gypi ('k') | tools/asan_build » ('j') | no next file with comments »