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

Unified Diff: gpu/gpu.gyp

Issue 944073005: gpu: Add support for gpu_perftests for android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Defend against divide by 0. Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gpu/perftests/texture_upload_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 70e99c893b0158fde73adf1d68be485ac035ac1a..2bb746554b2100c304b497500260230e26117f9d 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -298,6 +298,23 @@
'perftests/run_all_tests.cc',
'perftests/texture_upload_perftest.cc',
],
+ 'conditions': [
+ ['OS == "android"',
+ {
+ 'dependencies': [
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }
+ ],
+ # See http://crbug.com/162998#c4 for why this is needed.
+ ['OS=="linux" and use_allocator!="none"',
+ {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }
+ ],
+ ],
},
{
# GN version: //gpu:gl_tests
@@ -668,6 +685,17 @@
},
'includes': [ '../build/apk_test.gypi' ],
},
+ {
+ 'target_name': 'gpu_perftests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'gpu_perftests',
+ ],
+ 'variables': {
+ 'test_suite_name': 'gpu_perftests',
+ },
+ 'includes': [ '../build/apk_test.gypi' ],
+ },
],
}],
['OS == "win"', {
« no previous file with comments | « no previous file | gpu/perftests/texture_upload_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698