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

Unified Diff: gyp/libjpeg-turbo.gyp

Issue 2180333002: Fix yasm for Android build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Clean up 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 | « no previous file | third_party/yasm/android/yasm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/libjpeg-turbo.gyp
diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp
index 4df410cbfc7692ab7a0a969e1bee7df720e7cc10..d1977db371451269e9768989391f44c9eeb6044b 100644
--- a/gyp/libjpeg-turbo.gyp
+++ b/gyp/libjpeg-turbo.gyp
@@ -29,6 +29,17 @@
}],
},
{
+ 'target_name': 'yasm-android',
+ 'type': 'executable',
+ 'sources': [
+ '../third_party/yasm/android/yasm',
+ ],
+ 'copies' : [{
+ 'destination': '<(PRODUCT_DIR)',
+ 'files': [ '../third_party/yasm/android/yasm' ],
+ }],
+ },
+ {
'target_name': 'libjpeg-turbo',
'type': 'static_library',
'include_dirs': [
@@ -249,7 +260,7 @@
[ 'skia_os == "android" and host_os == "linux" and \
(skia_arch_type == "x86" or skia_arch_type == "x86_64")', {
'dependencies': [
- 'yasm.gyp:yasm#host',
+ 'yasm-android',
],
'variables': {
'yasm_path': '<(PRODUCT_DIR)/yasm',
« 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