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

Unified Diff: media/media.gyp

Issue 62863002: Set media_perftests up for android and to be built by the perfbots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add android dependency. Created 7 years, 1 month 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 | « build/all_android.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index d346dac4679b52e67b504dca3a21f8482ee10868..f8e847c11ebb92fbe36e5fbc1378ad636825c055 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1086,6 +1086,9 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../testing/perf/perf_test.gyp:perf_test',
+ '../ui/gfx/gfx.gyp:gfx',
+ '../ui/ui.gyp:ui',
+ '../ui/gl/gl.gyp:gl',
],
'sources': [
'base/audio_bus_perftest.cc',
@@ -1098,6 +1101,33 @@
'filters/pipeline_integration_perftest.cc',
'filters/pipeline_integration_test_base.cc',
],
+ 'conditions': [
+ ['arm_neon==1', {
+ 'defines': [
+ 'USE_NEON'
+ ],
+ }],
+ ['OS=="android"', {
+ 'conditions': [
+ ['gtest_target_type=="shared_library"', {
+ 'dependencies': [
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }],
+ ],
+ }],
+ ['media_use_ffmpeg==1', {
+ 'dependencies': [
+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ ],
+ }, { # media_use_ffmpeg==0
+ 'sources!': [
+ 'base/demuxer_perftest.cc',
+ 'filters/pipeline_integration_perftest.cc',
+ 'filters/pipeline_integration_test_base.cc',
+ ],
+ }],
+ ],
},
{
'target_name': 'media_test_support',
@@ -1385,6 +1415,19 @@
},
'includes': ['../build/apk_test.gypi'],
},
+ {
+ 'target_name': 'media_perftests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'media_java',
+ 'media_perftests',
+ ],
+ 'variables': {
+ 'test_suite_name': 'media_perftests',
+ 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)media_perftests<(SHARED_LIB_SUFFIX)',
+ },
+ 'includes': ['../build/apk_test.gypi'],
+ },
],
}],
['OS=="android"', {
« no previous file with comments | « build/all_android.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698