Index: third_party/libpng/libpng.gyp |
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp |
index bd4e3a8f131e4bedaeb8fd8115cee4d92cd13d74..38082f4e0e0b7084a3a64b0b303f5254eaec5f9c 100644 |
--- a/third_party/libpng/libpng.gyp |
+++ b/third_party/libpng/libpng.gyp |
@@ -6,7 +6,6 @@ |
'targets': [ |
{ |
'target_name': 'libpng', |
- 'toolsets': ['target', 'host'], |
'dependencies': [ |
'../zlib/zlib.gyp:zlib', |
], |
@@ -68,18 +67,10 @@ |
'defines': [ |
'PNG_USE_DLL', |
], |
- }, |
+ }, |
}], |
- ['OS=="android" and _toolset=="target"', { |
- 'includes': [ |
- "../../build/android/cpufeatures.gypi", |
- ], |
- }], |
- ['target_arch=="arm"', { |
- 'sources': [ |
- 'arm/arm_init.c', |
- 'arm/filter_neon.S', |
- ], |
+ ['OS=="android"', { |
+ 'toolsets': ['target', 'host'], |
}], |
], |
}, |