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

Side by Side Diff: gyp/libjpeg-turbo.gyp

Issue 2187663002: Rename yasm binary and make it executable (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | third_party/yasm/android/yasm » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'xcode_settings': { 6 'xcode_settings': {
7 'SYMROOT': '<(DEPTH)/xcodebuild', 7 'SYMROOT': '<(DEPTH)/xcodebuild',
8 }, 8 },
9 'variables': { 9 'variables': {
10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/li bjpeg-turbo', 10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/li bjpeg-turbo',
(...skipping 14 matching lines...) Expand all
25 ], 25 ],
26 'copies' : [{ 26 'copies' : [{
27 'destination': '<(PRODUCT_DIR)', 27 'destination': '<(PRODUCT_DIR)',
28 'files': [ '../third_party/externals/yasm/binaries/win/yasm.exe' ], 28 'files': [ '../third_party/externals/yasm/binaries/win/yasm.exe' ],
29 }], 29 }],
30 }, 30 },
31 { 31 {
32 'target_name': 'yasm-android', 32 'target_name': 'yasm-android',
33 'type': 'executable', 33 'type': 'executable',
34 'sources': [ 34 'sources': [
35 '../third_party/yasm/android/yasm', 35 '../third_party/yasm/android/yasm-android',
36 ], 36 ],
37 'copies' : [{ 37 'copies' : [{
38 'destination': '<(PRODUCT_DIR)', 38 'destination': '<(PRODUCT_DIR)',
39 'files': [ '../third_party/yasm/android/yasm' ], 39 'files': [ '../third_party/yasm/android/yasm-android' ],
40 }], 40 }],
41 }, 41 },
42 { 42 {
43 'target_name': 'libjpeg-turbo', 43 'target_name': 'libjpeg-turbo',
44 'type': 'static_library', 44 'type': 'static_library',
45 'include_dirs': [ 45 'include_dirs': [
46 '../third_party/externals/libjpeg-turbo/', 46 '../third_party/externals/libjpeg-turbo/',
47 ], 47 ],
48 'defines': [ 48 'defines': [
49 'WITH_SIMD', 49 'WITH_SIMD',
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 }], 256 }],
257 ], 257 ],
258 }, 258 },
259 }], 259 }],
260 [ 'skia_os == "android" and host_os == "linux" and \ 260 [ 'skia_os == "android" and host_os == "linux" and \
261 (skia_arch_type == "x86" or skia_arch_type == "x86_64")', { 261 (skia_arch_type == "x86" or skia_arch_type == "x86_64")', {
262 'dependencies': [ 262 'dependencies': [
263 'yasm-android', 263 'yasm-android',
264 ], 264 ],
265 'variables': { 265 'variables': {
266 'yasm_path': '<(PRODUCT_DIR)/yasm', 266 'yasm_path': '<(PRODUCT_DIR)/yasm-android',
267 'conditions': [ 267 'conditions': [
268 [ 'skia_arch_type == "x86"', { 268 [ 'skia_arch_type == "x86"', {
269 'yasm_format': '-felf', 269 'yasm_format': '-felf',
270 'yasm_flags': [ 270 'yasm_flags': [
271 '-D__x86__', 271 '-D__x86__',
272 '-DELF', 272 '-DELF',
273 '-DPIC', 273 '-DPIC',
274 ], 274 ],
275 }, { 275 }, {
276 'yasm_format': '-felf64', 276 'yasm_format': '-felf64',
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 ], 355 ],
356 'process_outputs_as_sources': 1, 356 'process_outputs_as_sources': 1,
357 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)', 357 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
358 }], 358 }],
359 ] 359 ]
360 }, 360 },
361 ], 361 ],
362 }, 362 },
363 ], 363 ],
364 } 364 }
OLDNEW
« no previous file with comments | « no previous file | third_party/yasm/android/yasm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698