| 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 |
| 11 { | 11 { |
| 12 'variables': { |
| 13 'skia_warnings_as_errors': 0, |
| 14 }, |
| 12 'targets': [ | 15 'targets': [ |
| 13 { | 16 { |
| 14 'target_name': 'cpu_features', | 17 'target_name': 'cpu_features', |
| 15 'type': 'static_library', | 18 'type': 'static_library', |
| 16 'direct_dependent_settings': { | 19 'direct_dependent_settings': { |
| 17 'include_dirs': [ | 20 'include_dirs': [ |
| 18 '../third_party/cpufeatures', | 21 '../third_party/cpufeatures', |
| 19 ], | 22 ], |
| 20 }, | 23 }, |
| 21 'sources': [ | 24 'sources': [ |
| 22 '../third_party/cpufeatures/cpu-features.c', | 25 '../third_party/cpufeatures/cpu-features.c', |
| 23 '../third_party/cpufeatures/cpu-features.h', | 26 '../third_party/cpufeatures/cpu-features.h', |
| 24 ], | 27 ], |
| 28 'cflags!': [ |
| 29 '-fno-rtti', # supresses warnings about invalid option of non-C++ code |
| 30 ], |
| 25 }, | 31 }, |
| 26 { | 32 { |
| 27 'target_name': 'expat', | 33 'target_name': 'expat', |
| 28 'type': 'static_library', | 34 'type': 'static_library', |
| 29 'sources': [ | 35 'sources': [ |
| 30 '../third_party/externals/expat/lib/xmlparse.c', | 36 '../third_party/externals/expat/lib/xmlparse.c', |
| 31 '../third_party/externals/expat/lib/xmlrole.c', | 37 '../third_party/externals/expat/lib/xmlrole.c', |
| 32 '../third_party/externals/expat/lib/xmltok.c', | 38 '../third_party/externals/expat/lib/xmltok.c', |
| 33 ], | 39 ], |
| 34 'include_dirs': [ | 40 'include_dirs': [ |
| (...skipping 27 matching lines...) Expand all Loading... |
| 62 'include_dirs': [ | 68 'include_dirs': [ |
| 63 '../third_party/externals/gif', | 69 '../third_party/externals/gif', |
| 64 ], | 70 ], |
| 65 'cflags': [ | 71 'cflags': [ |
| 66 '-Wno-format', | 72 '-Wno-format', |
| 67 '-DHAVE_CONFIG_H', | 73 '-DHAVE_CONFIG_H', |
| 68 ], | 74 ], |
| 69 'cflags!': [ | 75 'cflags!': [ |
| 70 '-fno-rtti', # supresses warnings about invalid option of non-C++ code | 76 '-fno-rtti', # supresses warnings about invalid option of non-C++ code |
| 71 '-Wall', | 77 '-Wall', |
| 72 '-Werror', | |
| 73 ], | 78 ], |
| 74 'direct_dependent_settings': { | 79 'direct_dependent_settings': { |
| 75 'include_dirs': [ | 80 'include_dirs': [ |
| 76 '../third_party/externals/gif', | 81 '../third_party/externals/gif', |
| 77 ], | 82 ], |
| 78 } | 83 } |
| 79 }, | 84 }, |
| 80 { | 85 { |
| 81 'target_name': 'png', | 86 'target_name': 'png', |
| 82 'type': 'static_library', | 87 'type': 'static_library', |
| (...skipping 18 matching lines...) Expand all Loading... |
| 101 ], | 106 ], |
| 102 'include_dirs': [ | 107 'include_dirs': [ |
| 103 '../third_party/externals/png', | 108 '../third_party/externals/png', |
| 104 ], | 109 ], |
| 105 'cflags': [ | 110 'cflags': [ |
| 106 '-fvisibility=hidden', | 111 '-fvisibility=hidden', |
| 107 ], | 112 ], |
| 108 'cflags!': [ | 113 'cflags!': [ |
| 109 '-fno-rtti', # supresses warnings about invalid option of non-C++ code | 114 '-fno-rtti', # supresses warnings about invalid option of non-C++ code |
| 110 '-Wall', | 115 '-Wall', |
| 111 '-Werror', | |
| 112 ], | 116 ], |
| 113 'link_settings': { | 117 'link_settings': { |
| 114 'libraries': [ | 118 'libraries': [ |
| 115 '-lz', | 119 '-lz', |
| 116 ], | 120 ], |
| 117 }, | 121 }, |
| 118 'direct_dependent_settings': { | 122 'direct_dependent_settings': { |
| 119 'include_dirs': [ | 123 'include_dirs': [ |
| 120 '../third_party/externals/png', | 124 '../third_party/externals/png', |
| 121 ], | 125 ], |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 '-fvisibility=hidden', | 183 '-fvisibility=hidden', |
| 180 '-DAVOID_TABLES', | 184 '-DAVOID_TABLES', |
| 181 '-O3', | 185 '-O3', |
| 182 '-fstrict-aliasing', | 186 '-fstrict-aliasing', |
| 183 '-fprefetch-loop-arrays', | 187 '-fprefetch-loop-arrays', |
| 184 '-DANDROID_TILE_BASED_DECODE', | 188 '-DANDROID_TILE_BASED_DECODE', |
| 185 ], | 189 ], |
| 186 'cflags!': [ | 190 'cflags!': [ |
| 187 '-fno-rtti', # supresses warnings about invalid option of non-C++ code | 191 '-fno-rtti', # supresses warnings about invalid option of non-C++ code |
| 188 '-Wall', | 192 '-Wall', |
| 189 '-Werror', | |
| 190 ], | 193 ], |
| 191 'direct_dependent_settings': { | 194 'direct_dependent_settings': { |
| 192 'include_dirs': [ | 195 'include_dirs': [ |
| 193 '../third_party/externals/jpeg', | 196 '../third_party/externals/jpeg', |
| 194 ], | 197 ], |
| 195 } | 198 } |
| 196 }, | 199 }, |
| 197 { | 200 { |
| 198 # This target is a dependency for all console-type Skia applications which | 201 # This target is a dependency for all console-type Skia applications which |
| 199 # will run on Android. Since Android requires us to load native code in | 202 # will run on Android. Since Android requires us to load native code in |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 }], | 251 }], |
| 249 ], | 252 ], |
| 250 'sources': [ | 253 'sources': [ |
| 251 '../../android/app/jni/com_skia_SkiaSampleRenderer.cpp', | 254 '../../android/app/jni/com_skia_SkiaSampleRenderer.cpp', |
| 252 ], | 255 ], |
| 253 }, | 256 }, |
| 254 | 257 |
| 255 }, | 258 }, |
| 256 ] | 259 ] |
| 257 } | 260 } |
| OLD | NEW |