| 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 # We tried adding this gyp file to the android directory at the root of | 5 # We tried adding this 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 intended output directory. So to avoid this we created a simple | 7 # outside of the intended output directory. So to avoid this we created a simple |
| 8 # shim here that includes the android_deps.gypi file. The actual dependencies | 8 # shim here that includes the android_deps.gypi file. The actual dependencies |
| 9 # are defined and maintained in that gypi file. | 9 # are defined and maintained in that gypi file. |
| 10 # | 10 # |
| 11 # Also this assumes that the android directory is a sibling to the directory | 11 # Also this assumes that the android directory is a sibling to the directory |
| 12 # that contains your primary Skia checkout. If it is not then you must manually | 12 # that contains your primary Skia checkout. If it is not then you must manually |
| 13 # edit the includes below to specify the actual location of the android.gypi. | 13 # edit the includes below to specify the actual location of the android.gypi. |
| 14 # This is due to the fact that we cannot use variables in an includes as the | 14 # This is due to the fact that we cannot use variables in an includes as the |
| 15 # variable expansion step for gyp happens after the includes are processed. | 15 # variable expansion step for gyp happens after the includes are processed. |
| 16 { | 16 { |
| 17 'conditions': [ | 17 'includes': [ |
| 18 [ 'skia_android_framework == 0', | 18 '../platform_tools/android/gyp/dependencies.gypi', |
| 19 { | |
| 20 'includes': [ | |
| 21 '../platform_tools/android/gyp/dependencies.gypi', | |
| 22 ], | |
| 23 }, { # else skia_android_framework | |
| 24 'cflags': [ | |
| 25 '-Wno-error' | |
| 26 ], | |
| 27 'targets': [ | |
| 28 { | |
| 29 'target_name': 'expat', | |
| 30 'type': 'none', | |
| 31 'direct_dependent_settings': { | |
| 32 'libraries' : [ | |
| 33 '-lexpat', | |
| 34 ], | |
| 35 }, | |
| 36 }, | |
| 37 { | |
| 38 'target_name': 'gif', | |
| 39 'type': 'none', | |
| 40 'direct_dependent_settings': { | |
| 41 'libraries' : [ | |
| 42 'libgif.a', | |
| 43 ], | |
| 44 'include_dirs': [ | |
| 45 'external/giflib', | |
| 46 ], | |
| 47 }, | |
| 48 }, | |
| 49 { | |
| 50 'target_name': 'png', | |
| 51 'type': 'none', | |
| 52 'direct_dependent_settings': { | |
| 53 'libraries' : [ | |
| 54 '-lpng', | |
| 55 ], | |
| 56 'include_dirs': [ | |
| 57 'external/libpng', | |
| 58 ], | |
| 59 }, | |
| 60 }, | |
| 61 { | |
| 62 'target_name': 'jpeg', | |
| 63 'type': 'none', | |
| 64 'direct_dependent_settings': { | |
| 65 'libraries' : [ | |
| 66 '-ljpeg', | |
| 67 ], | |
| 68 'include_dirs': [ | |
| 69 'external/jpeg', | |
| 70 ], | |
| 71 }, | |
| 72 }, | |
| 73 { | |
| 74 'target_name': 'cpu_features', | |
| 75 'type': 'none', | |
| 76 }, | |
| 77 ], | |
| 78 } | |
| 79 ], | |
| 80 ], | 19 ], |
| 81 } | 20 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 153093003:
Gyp file changes for the android framework. (Closed)
Base URL: https://skia.googlesource.com/skia.git@master