OLD | NEW |
---|---|
1 # Core Skia library code. | 1 # Core Skia library code. |
2 { | 2 { |
3 'targets': [ | 3 'targets': [ |
4 { | 4 { |
5 'target_name': 'core', | 5 'target_name': 'core', |
6 'product_name': 'skia_core', | 6 'product_name': 'skia_core', |
7 'type': 'static_library', | 7 'type': 'static_library', |
8 'standalone_static_library': 1, | 8 'standalone_static_library': 1, |
9 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', | 9 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', |
10 | 10 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
69 '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', | 69 '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', |
70 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework ', | 70 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework ', |
71 ], | 71 ], |
72 }, | 72 }, |
73 }], | 73 }], |
74 [ 'skia_os == "win"', { | 74 [ 'skia_os == "win"', { |
75 'include_dirs': [ | 75 'include_dirs': [ |
76 'config/win', | 76 'config/win', |
77 ], | 77 ], |
78 }], | 78 }], |
79 [ 'skia_os == "android"', { | 79 [ 'skia_os == "android" and skia_android_framework==0', { |
djsollen
2014/01/21 17:47:37
I don't think you need to modify this file. Just u
scroggo
2014/01/21 19:10:06
Done.
| |
80 'dependencies': [ | 80 'dependencies': [ |
81 'android_deps.gyp:cpu_features', | 81 'android_deps.gyp:cpu_features', |
82 ], | 82 ], |
83 }], | 83 }], |
84 [ 'skia_android_framework', { | |
85 'libraries': [ | |
86 '-lcutils', | |
87 ], | |
88 }], | |
84 [ 'skia_arch_type == "arm"', { | 89 [ 'skia_arch_type == "arm"', { |
85 # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. | 90 # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. |
86 'sources': [ | 91 'sources': [ |
87 '../src/core/SkUtilsArm.cpp', | 92 '../src/core/SkUtilsArm.cpp', |
88 '../src/core/SkUtilsArm.h', | 93 '../src/core/SkUtilsArm.h', |
89 ], | 94 ], |
90 }], | 95 }], |
91 ['skia_gpu == 1', { | 96 ['skia_gpu == 1', { |
92 'include_dirs': [ | 97 'include_dirs': [ |
93 '../include/gpu', | 98 '../include/gpu', |
(...skipping 25 matching lines...) Expand all Loading... | |
119 [ 'skia_os == "win"', { | 124 [ 'skia_os == "win"', { |
120 'include_dirs': [ | 125 'include_dirs': [ |
121 'config/win', | 126 'config/win', |
122 ], | 127 ], |
123 }], | 128 }], |
124 ], | 129 ], |
125 }, | 130 }, |
126 }, | 131 }, |
127 ], | 132 ], |
128 } | 133 } |
OLD | NEW |