[[ Bug 19882 ]] Make sure target_arch is compared with x64

runrevmark · runrevmark · commit 0e977bf44e58 · 2017-07-04T09:04:34.000Z
This patch ensures that the target-specific opt targets also use
x64 as a comparison option.
diff --git a/libskia/libskia.gyp b/libskia/libskia.gyp
@@ -243,7 +243,7 @@
 			'conditions':
 			[
 				[
-					'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',
+					'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',
 					{
 						'sources':
 						[
@@ -297,7 +297,7 @@
 			'conditions':
 			[
 				[
-					'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',
+					'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',
 					{
 						'sources':
 						[
@@ -351,7 +351,7 @@
 			'conditions':
 			[
 				[
-					'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',
+					'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',
 					{
 						'sources':
 						[
@@ -406,7 +406,7 @@
 			'conditions':
 			[
 				[
-					'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',
+					'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',
 					{
 						'sources':
 						[
@@ -460,7 +460,7 @@
 			'conditions':
 			[
 				[
-					'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',
+					'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',
 					{
 						'sources':
 						[
@@ -514,7 +514,7 @@
 			'conditions':
 			[
 				[
-					'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',
+					'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',
 					{
 						'sources':
 						[

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@`
`243`	`243`	`'conditions':`
`244`	`244`	`[`
`245`	`245`	`[`
`246`		`- 'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',`
	`246`	`+ 'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',`
`247`	`247`	`{`
`248`	`248`	`'sources':`
`249`	`249`	`[`
`@@ -297,7 +297,7 @@`
`297`	`297`	`'conditions':`
`298`	`298`	`[`
`299`	`299`	`[`
`300`		`- 'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',`
	`300`	`+ 'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',`
`301`	`301`	`{`
`302`	`302`	`'sources':`
`303`	`303`	`[`
`@@ -351,7 +351,7 @@`
`351`	`351`	`'conditions':`
`352`	`352`	`[`
`353`	`353`	`[`
`354`		`- 'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',`
	`354`	`+ 'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',`
`355`	`355`	`{`
`356`	`356`	`'sources':`
`357`	`357`	`[`
`@@ -406,7 +406,7 @@`
`406`	`406`	`'conditions':`
`407`	`407`	`[`
`408`	`408`	`[`
`409`		`- 'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',`
	`409`	`+ 'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',`
`410`	`410`	`{`
`411`	`411`	`'sources':`
`412`	`412`	`[`
`@@ -460,7 +460,7 @@`
`460`	`460`	`'conditions':`
`461`	`461`	`[`
`462`	`462`	`[`
`463`		`- 'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',`
	`463`	`+ 'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',`
`464`	`464`	`{`
`465`	`465`	`'sources':`
`466`	`466`	`[`
`@@ -514,7 +514,7 @@`
`514`	`514`	`'conditions':`
`515`	`515`	`[`
`516`	`516`	`[`
`517`		`- 'target_arch in ("i386", "x86", "x86_64", "i386 x86_64")',`
	`517`	`+ 'target_arch in ("i386", "x86", "x64", "x86_64", "i386 x86_64")',`
`518`	`518`	`{`
`519`	`519`	`'sources':`
`520`	`520`	`[`