Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index d346dac4679b52e67b504dca3a21f8482ee10868..d8d92fd1dc02b096d98abf184508b4b4d35f5bd2 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -1086,6 +1086,8 @@ |
| '../testing/gmock.gyp:gmock', |
| '../testing/gtest.gyp:gtest', |
| '../testing/perf/perf_test.gyp:perf_test', |
| + '../ui/gfx/gfx.gyp:gfx', |
| + '../ui/ui.gyp:ui', |
| ], |
| 'sources': [ |
| 'base/audio_bus_perftest.cc', |
| @@ -1098,6 +1100,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 +1414,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)', |
|
cjhopman
2013/11/14 21:17:22
input_shlib_path isn't actually needed (AFAICT).
|
| + }, |
| + 'includes': ['../build/apk_test.gypi'], |
| + }, |
| ], |
| }], |
| ['OS=="android"', { |