Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: platform_tools/android/gyp/skia_android.gypi

Issue 2018603003: Remove VisualBench and its Android implementation. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « platform_tools/android/gyp/dependencies.gypi ('k') | tools/VisualBench/TimingStateMachine.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 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 # This GYP file stores the dependencies necessary to build Skia on the Android 6 # This GYP file stores the dependencies necessary to build Skia on the Android
7 # platform. The OS doesn't provide many stable libraries as part of the 7 # platform. The OS doesn't provide many stable libraries as part of the
8 # distribution so we have to build a few of them ourselves. 8 # distribution so we have to build a few of them ourselves.
9 # 9 #
10 { 10 {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 ], 111 ],
112 'action': [ 112 'action': [
113 '<(android_base)/apps/gradlew', 113 '<(android_base)/apps/gradlew',
114 ':sample_app:assemble<(android_variant)<(android_buildtype)', 114 ':sample_app:assemble<(android_variant)<(android_buildtype)',
115 '-p<(android_base)/apps/sample_app', 115 '-p<(android_base)/apps/sample_app',
116 '-PsuppressNativeBuild', 116 '-PsuppressNativeBuild',
117 ], 117 ],
118 }, 118 },
119 ], 119 ],
120 }, 120 },
121 {
122 'target_name': 'CopyVisualBenchDeps',
123 'type': 'none',
124 'dependencies': [
125 'skia_lib.gyp:skia_lib',
126 'visualbench.gyp:visualbench',
127 ],
128
129 'copies': [
130 # Copy all shared libraries into the Android app's libs folder. Note
131 # that this copy requires us to build SkiaAndroidApp after those
132 # libraries, so that they exist by the time it occurs. If there are no
133 # libraries to copy, this will cause an error in Make, but the app will
134 # still build.
135 {
136 'destination': '<(android_base)/apps/visualbench/src/main/libs/<(andro id_arch)',
137 'conditions': [
138 [ 'skia_shared_lib', {
139 'files': [
140 '<(SHARED_LIB_DIR)/libskia_android.so',
141 '<(SHARED_LIB_DIR)/libvisualbench.so',
142 ]}, {
143 'files': [
144 '<(SHARED_LIB_DIR)/libvisualbench.so',
145 ]}
146 ],
147 ],
148 },
149 ],
150 },
151 {
152 'target_name': 'VisualBench_APK',
153 'type': 'none',
154 'dependencies': [
155 'CopyVisualBenchDeps',
156 ],
157 'actions': [
158 {
159 'action_name': 'SkiaVisualBench_apk',
160 'inputs': [
161 '<(android_base)/apps/visualbench/src/main/AndroidManifest.xml',
162 '<(android_base)/apps/visualbench/src/main/java/com/skia/VisualBench Activity.java',
163 '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libv isualbench.so',
164 ],
165 'conditions': [
166 [ 'skia_shared_lib', {
167 'inputs': [
168 '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/ libskia_android.so',
169 ],
170 }],
171 ],
172 'outputs': [
173 '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-<(an droid_variant)-<(android_apk_suffix)',
174 ],
175 'action': [
176 '<(android_base)/apps/gradlew',
177 ':visualbench:assemble<(android_variant)<(android_buildtype)',
178 '-p<(android_base)/apps/visualbench',
179 '-PsuppressNativeBuild',
180 ],
181 },
182 ],
183 },
184 {
185 'target_name': 'VisualBenchTest_APK',
186 'type': 'none',
187 'dependencies': [
188 'VisualBench_APK',
189 ],
190 'actions': [
191 {
192 'action_name': 'SkiaVisualBench_apk',
193 'inputs': [
194 '<(android_base)/apps/visualbench/src/main/AndroidManifest.xml',
195 '<(android_base)/apps/visualbench/src/main/java/com/skia/VisualBench Activity.java',
196 '<(android_base)/apps/visualbench/src/main/java/com/skia/VisualBench TestActivity.java',
197 '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libv isualbench.so',
198 ],
199 'conditions': [
200 [ 'skia_shared_lib', {
201 'inputs': [
202 '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/ libskia_android.so',
203 ],
204 }],
205 ],
206 'outputs': [
207 '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-<(an droid_variant)-debug-androidTest-unaligned.apk',
208 ],
209 'action': [
210 '<(android_base)/apps/gradlew',
211 ':visualbench:assemble<(android_variant)DebugAndroidTest',
212 '-p<(android_base)/apps/visualbench',
213 '-PsuppressNativeBuild',
214 ],
215 },
216 ],
217 },
218 # TODO all of this duplicated code can be removed when SDL becomes the defau lt
219 # Currently, to use this you have to override skia_use_sdl
220 {
221 'target_name': 'CopyVisualBenchSDLDeps',
222 'type': 'none',
223 'dependencies': [
224 'skia_lib.gyp:skia_lib',
225 'visualbench.gyp:visualbench',
226 ],
227
228 'copies': [
229 # Copy all shared libraries into the Android app's libs folder. Note
230 # that this copy requires us to build SkiaAndroidApp after those
231 # libraries, so that they exist by the time it occurs. If there are no
232 # libraries to copy, this will cause an error in Make, but the app will
233 # still build.
234 {
235 'destination': '<(android_base)/apps/visualbenchsdl/src/main/libs/<(an droid_arch)',
236 'conditions': [
237 [ 'skia_shared_lib', {
238 'files': [
239 '<(SHARED_LIB_DIR)/libskia_android.so',
240 '<(SHARED_LIB_DIR)/libvisualbench.so',
241 ]}, {
242 'files': [
243 '<(SHARED_LIB_DIR)/libvisualbench.so',
244 ]}
245 ],
246 ],
247 },
248 ],
249 },
250 {
251 'target_name': 'VisualBenchSDL_APK',
252 'type': 'none',
253 'dependencies': [
254 'CopyVisualBenchSDLDeps',
255 ],
256 'actions': [
257 {
258 'action_name': 'SkiaVisualBenchSDL_apk',
259 'inputs': [
260 '<(android_base)/apps/visualbenchsdl/src/main/AndroidManifest.xml',
261 '<(android_base)/apps/visualbenchsdl/src/main/java/org/libsdl/app/SD LActivity.java',
262 '<(android_base)/apps/visualbenchsdl/src/main/java/com/skia/VisualBe nchActivity.java',
263 '<(android_base)/apps/visualbenchsdl/src/main/libs/<(android_arch)/l ibvisualbench.so',
264 ],
265 'conditions': [
266 [ 'skia_shared_lib', {
267 'inputs': [
268 '<(android_base)/apps/visualbenchsdl/src/main/libs/<(android_arc h)/libskia_android.so',
269 ],
270 }],
271 ],
272 'outputs': [
273 '<(android_base)/apps/visualbenchsdl/build/outputs/apk/visualbench-< (android_variant)-<(android_apk_suffix)',
274 ],
275 'action': [
276 '<(android_base)/apps/gradlew',
277 ':visualbenchsdl:assemble<(android_variant)<(android_buildtype)',
278 '-p<(android_base)/apps/visualbenchsdl',
279 '-PsuppressNativeBuild',
280 ],
281 },
282 ],
283 },
284 ], 121 ],
285 } 122 }
OLDNEW
« no previous file with comments | « platform_tools/android/gyp/dependencies.gypi ('k') | tools/VisualBench/TimingStateMachine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698