diff options
author | toyoshim <toyoshim@chromium.org> | 2015-04-22 01:50:20 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-22 08:50:36 +0000 |
commit | 31624cad1a3b5cf26950b864837ba44b3aa38331 (patch) | |
tree | 538dc67301e747ea1fc9314e3bf1656a599c5eb3 /build | |
parent | 1ef6acc849df4b8137d14b52e426c9b742b56d0a (diff) | |
download | chromium_src-31624cad1a3b5cf26950b864837ba44b3aa38331.zip chromium_src-31624cad1a3b5cf26950b864837ba44b3aa38331.tar.gz chromium_src-31624cad1a3b5cf26950b864837ba44b3aa38331.tar.bz2 |
Web MIDI: split build rules for media/midi
Split MIDI related stuffs from media as a component in build files.
Also, MIDI related unit tests are split into midi_unittests.
BUG=475869
TEST=git cl try
Review URL: https://codereview.chromium.org/1065743003
Cr-Commit-Position: refs/heads/master@{#326247}
Diffstat (limited to 'build')
-rw-r--r-- | build/all.gyp | 15 | ||||
-rw-r--r-- | build/android/pylib/gtest/gtest_config.py | 1 | ||||
-rw-r--r-- | build/android/pylib/gtest/setup.py | 1 | ||||
-rw-r--r-- | build/gn_migration.gypi | 2 |
4 files changed, 19 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index d0cef6c..d5fa848 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -124,6 +124,7 @@ '../jingle/jingle.gyp:*', '../media/cast/cast.gyp:*', '../media/media.gyp:*', + '../media/midi/midi.gyp:*', '../mojo/mojo.gyp:*', '../mojo/mojo_base.gyp:*', '../ppapi/ppapi.gyp:*', @@ -344,6 +345,7 @@ '../jingle/jingle.gyp:jingle_unittests', '../media/cast/cast.gyp:cast_unittests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../mojo/mojo.gyp:mojo', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../remoting/remoting.gyp:remoting_unittests', @@ -567,6 +569,7 @@ '../content/content_shell_and_tests.gyp:content_shell', '../gpu/gpu.gyp:gpu_perftests', '../media/media.gyp:media_perftests', + '../media/midi/midi.gyp:midi_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', '../tools/telemetry/telemetry.gyp:*', ], @@ -681,6 +684,7 @@ '../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_unittests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../third_party/webrtc/tools/tools.gyp:frame_analyzer', '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter', ], @@ -814,6 +818,8 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_perftests_apk', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests_apk', + '../media/midi/midi.gyp:midi_unittests', '../net/net.gyp:net_unittests', '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps', '../skia/skia_tests.gyp:skia_unittests', @@ -842,6 +848,7 @@ '../gpu/gpu.gyp:gpu_unittests_apk', '../ipc/ipc.gyp:ipc_tests_apk', '../media/media.gyp:media_unittests_apk', + '../media/midi/midi.gyp:midi_unittests_apk', '../net/net.gyp:net_unittests_apk', '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk', '../skia/skia_tests.gyp:skia_unittests_apk', @@ -928,6 +935,7 @@ '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', @@ -967,6 +975,7 @@ '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', @@ -994,6 +1003,7 @@ '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', @@ -1017,6 +1027,7 @@ '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../net/net.gyp:net_unittests', '../google_apis/gcm/gcm.gyp:gcm_unit_tests', '../printing/printing.gyp:printing_unittests', @@ -1068,6 +1079,7 @@ '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', @@ -1107,6 +1119,7 @@ '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', @@ -1165,6 +1178,7 @@ '../jingle/jingle.gyp:jingle_unittests', '../media/cast/cast.gyp:cast_unittests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../mojo/mojo.gyp:mojo', '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', @@ -1233,6 +1247,7 @@ '../chrome/chrome.gyp:sync_integration_tests', '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../net/net.gyp:net_unittests_run', '../printing/printing.gyp:printing_unittests', '../sql/sql.gyp:sql_unittests', diff --git a/build/android/pylib/gtest/gtest_config.py b/build/android/pylib/gtest/gtest_config.py index 8608ed7..daea1df 100644 --- a/build/android/pylib/gtest/gtest_config.py +++ b/build/android/pylib/gtest/gtest_config.py @@ -31,6 +31,7 @@ STABLE_TEST_SUITES = [ 'gpu_unittests', 'ipc_tests', 'media_unittests', + 'midi_unittests', 'net_unittests', 'sandbox_linux_unittests', 'skia_unittests', diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py index 1b882ca..2228aa1 100644 --- a/build/android/pylib/gtest/setup.py +++ b/build/android/pylib/gtest/setup.py @@ -36,6 +36,7 @@ ISOLATE_FILE_PATHS = { 'content_unittests': 'content/content_unittests.isolate', 'media_perftests': 'media/media_perftests.isolate', 'media_unittests': 'media/media_unittests.isolate', + 'midi_unittests': 'media/midi/midi_unittests.isolate', 'net_unittests': 'net/net_unittests.isolate', 'sql_unittests': 'sql/sql_unittests.isolate', 'sync_unit_tests': 'sync/sync_unit_tests.isolate', diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index 76d3b59..90ebfab 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -99,6 +99,7 @@ '../media/media.gyp:ffmpeg_regression_tests', # TODO(GYP) this should be conditional on media_use_ffmpeg '../media/media.gyp:media_perftests', '../media/media.gyp:media_unittests', + '../media/midi/midi.gyp:midi_unittests', '../media/cast/cast.gyp:cast_benchmarks', '../media/cast/cast.gyp:cast_unittests', '../media/cast/cast.gyp:generate_barcode_video', @@ -522,6 +523,7 @@ '../gpu/gpu.gyp:gpu_unittests_run', '../media/cast/cast.gyp:cast_unittests_run', '../media/media.gyp:media_unittests_run', + '../media/midi/midi.gyp:midi_unittests_run', '../net/net.gyp:net_unittests_run', '../sql/sql.gyp:sql_unittests_run', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests_run', |