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

Unified Diff: gyp/opts.gyp

Issue 140503007: Scripts to generate Android.mk for framework Skia. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update copyrights, remove unnecessary code. Created 6 years, 11 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
Index: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index bd072cb1e8efff9744650a42b211eb537ff25a83..363095dbc4bcc712342db945f9859786b9f7cebf 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -1,3 +1,4 @@
+# Gyp file for opts projects
{
'targets': [
# Due to an unfortunate intersection of lameness between gcc and gyp,
@@ -97,7 +98,9 @@
}],
],
}],
- [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', {
+ [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \
+ or (skia_os == "ios") \
+ or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips"])', {
'sources': [
'../src/opts/SkBitmapProcState_opts_none.cpp',
'../src/opts/SkBlitMask_opts_none.cpp',

Powered by Google App Engine
This is Rietveld 408576698