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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libpng/libpng.gyp

Issue 23271006: libpng 1.6.3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix macros & gyp file. Created 7 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 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') | third_party/libpng/pnglibconf.h » ('J')
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 38082f4e0e0b7084a3a64b0b303f5254eaec5f9c..d0e192e76e84ce0c38b17858f965519a650f5ecc 100644
--- a/third_party/libpng/libpng.gyp
+++ b/third_party/libpng/libpng.gyp
@@ -67,11 +67,22 @@
'defines': [
'PNG_USE_DLL',
],
- },
+ },
}],
['OS=="android"', {
'toolsets': ['target', 'host'],
}],
+ ['target_arch=="arm"', {
+ 'sources': [
+ 'arm/arm_init.c',
+ 'arm/filter_neon.S',
+ ],
+ }],
+ ['OS=="android" and target_arch=="arm"', {
+ 'include_dirs': [
+ "../android_tools/ndk/sources/cpufeatures/",
+ ],
+ }],
],
},
]
« no previous file with comments | « third_party/libpng/arm/filter_neon.S ('k') | third_party/libpng/png.h » ('j') | third_party/libpng/pnglibconf.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698