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

Unified Diff: third_party/libpng/libpng.gyp

Issue 23494067: Revert "libpng 1.6.3" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | « third_party/libpng/arm/filter_neon.S ('k') | third_party/libpng/png.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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'],
}],
],
},
« no previous file with comments | « third_party/libpng/arm/filter_neon.S ('k') | third_party/libpng/png.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698