Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # This GYP file stores the dependencies necessary to build Skia on the Android | 1 # This GYP file stores the dependencies necessary to build Skia on the Android |
| 2 # platform. The OS doesn't provide many stable libraries as part of the | 2 # platform. The OS doesn't provide many stable libraries as part of the |
| 3 # distribution so we have to build a few of them ourselves. | 3 # distribution so we have to build a few of them ourselves. |
| 4 # | 4 # |
| 5 # NOTE: We tried adding the gyp file to the android/ directory at the root of | 5 # NOTE: We tried adding the gyp file to the android/ directory at the root of |
| 6 # the Skia repo, but that resulted in the generated makefiles being created | 6 # the Skia repo, but that resulted in the generated makefiles being created |
| 7 # outside of the out directory. We may be able to move the bulk of this gyp | 7 # outside of the out directory. We may be able to move the bulk of this gyp |
| 8 # to the /android directory and put a simple shim here, but that has yet to be | 8 # to the /android directory and put a simple shim here, but that has yet to be |
| 9 # tested. | 9 # tested. |
| 10 | 10 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 ], | 64 ], |
| 65 'include_dirs': [ | 65 'include_dirs': [ |
| 66 '../third_party/externals/gif', | 66 '../third_party/externals/gif', |
| 67 ], | 67 ], |
| 68 'cflags': [ | 68 'cflags': [ |
| 69 '-Wno-format', | 69 '-Wno-format', |
| 70 '-DHAVE_CONFIG_H', | 70 '-DHAVE_CONFIG_H', |
| 71 ], | 71 ], |
| 72 'cflags!': [ | 72 'cflags!': [ |
| 73 '-Wall', | 73 '-Wall', |
| 74 '-Wextra', | |
|
mtklein
2013/11/18 21:21:56
Maybe just cflags: [ '-w' ] these guys?
djsollen
2013/11/18 21:34:04
Done.
| |
| 74 ], | 75 ], |
| 75 'direct_dependent_settings': { | 76 'direct_dependent_settings': { |
| 76 'include_dirs': [ | 77 'include_dirs': [ |
| 77 '../third_party/externals/gif', | 78 '../third_party/externals/gif', |
| 78 ], | 79 ], |
| 79 } | 80 } |
| 80 }, | 81 }, |
| 81 { | 82 { |
| 82 'target_name': 'png', | 83 'target_name': 'png', |
| 83 'type': 'static_library', | 84 'type': 'static_library', |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 101 '../third_party/externals/png/pngwutil.c', | 102 '../third_party/externals/png/pngwutil.c', |
| 102 ], | 103 ], |
| 103 'include_dirs': [ | 104 'include_dirs': [ |
| 104 '../third_party/externals/png', | 105 '../third_party/externals/png', |
| 105 ], | 106 ], |
| 106 'cflags': [ | 107 'cflags': [ |
| 107 '-fvisibility=hidden', | 108 '-fvisibility=hidden', |
| 108 ], | 109 ], |
| 109 'cflags!': [ | 110 'cflags!': [ |
| 110 '-Wall', | 111 '-Wall', |
| 112 '-Wextra', | |
| 111 ], | 113 ], |
| 112 'link_settings': { | 114 'link_settings': { |
| 113 'libraries': [ | 115 'libraries': [ |
| 114 '-lz', | 116 '-lz', |
| 115 ], | 117 ], |
| 116 }, | 118 }, |
| 117 'direct_dependent_settings': { | 119 'direct_dependent_settings': { |
| 118 'include_dirs': [ | 120 'include_dirs': [ |
| 119 '../third_party/externals/png', | 121 '../third_party/externals/png', |
| 120 ], | 122 ], |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 240 }], | 242 }], |
| 241 ], | 243 ], |
| 242 'sources': [ | 244 'sources': [ |
| 243 '../app/jni/com_skia_SkiaSampleRenderer.cpp', | 245 '../app/jni/com_skia_SkiaSampleRenderer.cpp', |
| 244 ], | 246 ], |
| 245 }, | 247 }, |
| 246 | 248 |
| 247 }, | 249 }, |
| 248 ] | 250 ] |
| 249 } | 251 } |
| OLD | NEW |