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

Unified Diff: gyp/libpng.gyp

Issue 972743003: Revert of Add SkCodec, including PNG implementation. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 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 | « gyp/copy_file.py ('k') | gyp/skia_lib.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/libpng.gyp
diff --git a/gyp/libpng.gyp b/gyp/libpng.gyp
index 96120a8a618a9f79201c3ecdaab19eb1ffbdd65a..92ff8d5e77cdf4a6acc98092096af7ef63af4318 100644
--- a/gyp/libpng.gyp
+++ b/gyp/libpng.gyp
@@ -32,35 +32,10 @@
'-w',
'-fvisibility=hidden',
],
- 'conditions': [
- ['not arm_neon', {
- 'defines': [
- # FIXME: Why is this needed? Without it, pngpriv.h sets it
- # to 2 if __ARM_NEON is defined, but shouldn't __ARM_NEON
- # not be defined since arm_neon is 0?
- 'PNG_ARM_NEON_OPT=0',
- ],
- }],
- ],
- 'actions': [
- {
- 'action_name': 'generate_pngconf',
- 'variables' : {
- 'prebuilt': '../third_party/externals/libpng/scripts/pnglibconf.h.prebuilt',
- 'generated': '../third_party/externals/libpng/pnglibconf.h',
- },
- 'inputs': [
- '<(prebuilt)',
- ],
- 'outputs': [
- '<(generated)',
- ],
- 'action': ['python', 'copy_file.py', '<(prebuilt)', '<(generated)'],
- },
- ],
'sources': [
'../third_party/externals/libpng/png.c',
'../third_party/externals/libpng/pngerror.c',
+ '../third_party/externals/libpng/pnggccrd.c',
'../third_party/externals/libpng/pngget.c',
'../third_party/externals/libpng/pngmem.c',
'../third_party/externals/libpng/pngpread.c',
@@ -70,6 +45,7 @@
'../third_party/externals/libpng/pngrutil.c',
'../third_party/externals/libpng/pngset.c',
'../third_party/externals/libpng/pngtrans.c',
+ '../third_party/externals/libpng/pngvcrd.c',
'../third_party/externals/libpng/pngwio.c',
'../third_party/externals/libpng/pngwrite.c',
'../third_party/externals/libpng/pngwtran.c',
« no previous file with comments | « gyp/copy_file.py ('k') | gyp/skia_lib.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698