| OLD | NEW | 
|    1 # Copyright 2014 Google Inc. |    1 # Copyright 2014 Google Inc. | 
|    2 # |    2 # | 
|    3 # Use of this source code is governed by a BSD-style license that can be |    3 # Use of this source code is governed by a BSD-style license that can be | 
|    4 # found in the LICENSE file. |    4 # found in the LICENSE file. | 
|    5  |    5  | 
|    6 { |    6 { | 
|    7   'variables': { |    7   'variables': { | 
|    8     'skia_warnings_as_errors': 0, |    8     'skia_warnings_as_errors': 0, | 
|    9   }, |    9   }, | 
|   10   'targets': [ |   10   'targets': [ | 
| (...skipping 14 matching lines...) Expand all  Loading... | 
|   25             ], |   25             ], | 
|   26             'direct_dependent_settings': { |   26             'direct_dependent_settings': { | 
|   27               'include_dirs': [ |   27               'include_dirs': [ | 
|   28                 '../third_party/externals/libpng', |   28                 '../third_party/externals/libpng', | 
|   29               ], |   29               ], | 
|   30             }, |   30             }, | 
|   31             'cflags': [ |   31             'cflags': [ | 
|   32               '-w', |   32               '-w', | 
|   33               '-fvisibility=hidden', |   33               '-fvisibility=hidden', | 
|   34             ], |   34             ], | 
|   35             'conditions': [ |  | 
|   36               ['not arm_neon', { |  | 
|   37                 'defines': [ |  | 
|   38                     # FIXME: Why is this needed? Without it, pngpriv.h sets it |  | 
|   39                     # to 2 if __ARM_NEON is defined, but shouldn't __ARM_NEON |  | 
|   40                     # not be defined since arm_neon is 0? |  | 
|   41                     'PNG_ARM_NEON_OPT=0', |  | 
|   42                 ], |  | 
|   43               }], |  | 
|   44             ], |  | 
|   45             'actions': [ |  | 
|   46               { |  | 
|   47                 'action_name': 'generate_pngconf', |  | 
|   48                 'variables' : { |  | 
|   49                   'prebuilt': '../third_party/externals/libpng/scripts/pnglibcon
     f.h.prebuilt', |  | 
|   50                   'generated': '../third_party/externals/libpng/pnglibconf.h', |  | 
|   51                 }, |  | 
|   52                 'inputs': [ |  | 
|   53                   '<(prebuilt)', |  | 
|   54                 ], |  | 
|   55                 'outputs': [ |  | 
|   56                   '<(generated)', |  | 
|   57                 ], |  | 
|   58                 'action': ['python', 'copy_file.py', '<(prebuilt)', '<(generated
     )'], |  | 
|   59               }, |  | 
|   60             ], |  | 
|   61             'sources': [ |   35             'sources': [ | 
|   62               '../third_party/externals/libpng/png.c', |   36               '../third_party/externals/libpng/png.c', | 
|   63               '../third_party/externals/libpng/pngerror.c', |   37               '../third_party/externals/libpng/pngerror.c', | 
 |   38               '../third_party/externals/libpng/pnggccrd.c', | 
|   64               '../third_party/externals/libpng/pngget.c', |   39               '../third_party/externals/libpng/pngget.c', | 
|   65               '../third_party/externals/libpng/pngmem.c', |   40               '../third_party/externals/libpng/pngmem.c', | 
|   66               '../third_party/externals/libpng/pngpread.c', |   41               '../third_party/externals/libpng/pngpread.c', | 
|   67               '../third_party/externals/libpng/pngread.c', |   42               '../third_party/externals/libpng/pngread.c', | 
|   68               '../third_party/externals/libpng/pngrio.c', |   43               '../third_party/externals/libpng/pngrio.c', | 
|   69               '../third_party/externals/libpng/pngrtran.c', |   44               '../third_party/externals/libpng/pngrtran.c', | 
|   70               '../third_party/externals/libpng/pngrutil.c', |   45               '../third_party/externals/libpng/pngrutil.c', | 
|   71               '../third_party/externals/libpng/pngset.c', |   46               '../third_party/externals/libpng/pngset.c', | 
|   72               '../third_party/externals/libpng/pngtrans.c', |   47               '../third_party/externals/libpng/pngtrans.c', | 
 |   48               '../third_party/externals/libpng/pngvcrd.c', | 
|   73               '../third_party/externals/libpng/pngwio.c', |   49               '../third_party/externals/libpng/pngwio.c', | 
|   74               '../third_party/externals/libpng/pngwrite.c', |   50               '../third_party/externals/libpng/pngwrite.c', | 
|   75               '../third_party/externals/libpng/pngwtran.c', |   51               '../third_party/externals/libpng/pngwtran.c', | 
|   76               '../third_party/externals/libpng/pngwutil.c', |   52               '../third_party/externals/libpng/pngwutil.c', | 
|   77             ], |   53             ], | 
|   78           }, {  # not skia_libpng_static |   54           }, {  # not skia_libpng_static | 
|   79             'type': 'none', |   55             'type': 'none', | 
|   80             'conditions': [ |   56             'conditions': [ | 
|   81               [ 'skia_os == "android"', |   57               [ 'skia_os == "android"', | 
|   82                 { |   58                 { | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
|  103                   }, |   79                   }, | 
|  104                 } |   80                 } | 
|  105               ] |   81               ] | 
|  106             ] |   82             ] | 
|  107           } |   83           } | 
|  108         ] |   84         ] | 
|  109       ], |   85       ], | 
|  110     }, |   86     }, | 
|  111   ] |   87   ] | 
|  112 } |   88 } | 
| OLD | NEW |