Skip to content

Commit

Permalink
Revert of Web MIDI: split build rules for media/midi (patchset chromi…
Browse files Browse the repository at this point in the history 
…um#19 id:340001 of https://codereview.chromium.org/1065743003/)

Reason for revert:
Very sorry to have to revert this after so much work, but midi_unittests has been consistently broken on Android Tests bot e.g. https://build.chromium.org/p/chromium.webkit/builders/Android%20Tests%20%28dbg%29/builds/25597

Original issue's description:
> 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
>
> Committed: https://crrev.com/31624cad1a3b5cf26950b864837ba44b3aa38331
> Cr-Commit-Position: refs/heads/master@{#326247}

TBR=phajdan.jr@chromium.org,dalecurtis@chromium.org,dpranke@chromium.org,boliu@chromium.org,damienv@chromium.org,jam@chromium.org,thestig@chromium.org,lcwu@chromium.org,gunsch@chromium.org,toyoshim@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=475869

Review URL: https://codereview.chromium.org/1085843003

Cr-Commit-Position: refs/heads/master@{#326343}
  • Loading branch information
aboxhall authored and Commit bot committed Apr 22, 2015
1 parent 15426e1 commit 60006f2
Show file tree
Hide file tree
Showing 41 changed files with 158 additions and 739 deletions.
4 changes: 1 addition & 3 deletions BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ group("gn_all") {
"//mandoline:mandoline_all",
"//media:media_unittests",
"//media/cast:cast_unittests",
"//media/midi:midi_unittests",
"//mojo",
"//mojo/application",
"//mojo/common:mojo_common_unittests",
Expand Down Expand Up @@ -721,9 +720,8 @@ if (is_linux) {
"//ipc:ipc_tests", # PASSES 2/25/2015
"//ipc/mojo:ipc_mojo_unittests", # PASSES 2/25/2015
"//jingle:jingle_unittests", # PASSES 2/25/2015
"//media:media_unittests", # PASSES 3/3/2015
"//media/cast:cast_unittests", # PASSES 2/25/2015
"//media/midi:midi_unittests", # PASSES 4/10/2015
"//media:media_unittests", # PASSES 3/3/2015
"//mojo/common:mojo_common_unittests", # PASSES 2/25/2015
"//net:net_unittests", # PASSES 2/25/2015
"//ppapi:ppapi_unittests", # PASSES 2/26/2015
Expand Down
1 change: 0 additions & 1 deletion android_webview/android_webview.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@
'../gpu/gpu.gyp:gles2_implementation',
'../gpu/gpu.gyp:gl_in_process_context',
'../media/media.gyp:media',
'../media/midi/midi.gyp:midi',
'../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
'../third_party/WebKit/public/blink.gyp:blink',
Expand Down
15 changes: 0 additions & 15 deletions build/all.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
'../jingle/jingle.gyp:*',
'../media/cast/cast.gyp:*',
'../media/media.gyp:*',
'../media/midi/midi.gyp:*',
'../mojo/mojo.gyp:*',
'../mojo/mojo_base.gyp:*',
'../ppapi/ppapi.gyp:*',
Expand Down Expand Up @@ -345,7 +344,6 @@
'../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',
Expand Down Expand Up @@ -569,7 +567,6 @@
'../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:*',
],
Expand Down Expand Up @@ -684,7 +681,6 @@
'../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',
],
Expand Down Expand Up @@ -818,8 +814,6 @@
'../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',
Expand Down Expand Up @@ -848,7 +842,6 @@
'../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',
Expand Down Expand Up @@ -935,7 +928,6 @@
'../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',
Expand Down Expand Up @@ -975,7 +967,6 @@
'../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',
Expand Down Expand Up @@ -1003,7 +994,6 @@
'../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',
Expand All @@ -1027,7 +1017,6 @@
'../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',
Expand Down Expand Up @@ -1079,7 +1068,6 @@
'../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',
Expand Down Expand Up @@ -1119,7 +1107,6 @@
'../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',
Expand Down Expand Up @@ -1178,7 +1165,6 @@
'../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',
Expand Down Expand Up @@ -1247,7 +1233,6 @@
'../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',
Expand Down
1 change: 0 additions & 1 deletion build/android/pylib/gtest/gtest_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
'gpu_unittests',
'ipc_tests',
'media_unittests',
'midi_unittests',
'net_unittests',
'sandbox_linux_unittests',
'skia_unittests',
Expand Down
1 change: 0 additions & 1 deletion build/android/pylib/gtest/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
'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',
Expand Down
2 changes: 0 additions & 2 deletions build/gn_migration.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
'../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',
Expand Down Expand Up @@ -523,7 +522,6 @@
'../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',
Expand Down
2 changes: 0 additions & 2 deletions chromecast/chromecast_tests.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
'../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',
'../sandbox/sandbox.gyp:sandbox_linux_unittests',
'../sql/sql.gyp:sql_unittests',
Expand Down Expand Up @@ -189,7 +188,6 @@
'../cc/cc_tests.gyp:cc_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',
'../sql/sql.gyp:sql_unittests_apk',
Expand Down
1 change: 0 additions & 1 deletion content/app/DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ include_rules = [
"+gin/public/snapshot_fd_data.h",
"+gin/v8_initializer.h",
"+media/base", # For initializing media library.
"+media/midi", # For initializing midi library.
]
4 changes: 0 additions & 4 deletions content/app/android/library_loader_hooks.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "content/public/common/result_codes.h"
#include "device/vibration/android/vibration_jni_registrar.h"
#include "media/base/android/media_jni_registrar.h"
#include "media/midi/midi_jni_registrar.h"
#include "net/android/net_jni_registrar.h"
#include "ui/android/ui_android_jni_registrar.h"
#include "ui/base/android/ui_base_jni_registrar.h"
Expand Down Expand Up @@ -71,9 +70,6 @@ bool EnsureJniRegistered(JNIEnv* env) {
if (!media::RegisterJni(env))
return false;

if (!media::midi::RegisterJni(env))
return false;

if (!ui::RegisterUIAndroidJni(env))
return false;

Expand Down
1 change: 0 additions & 1 deletion content/common/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ source_set("common") {
"//gpu/ipc",
"//gpu/skia_bindings",
"//media",
"//media/midi",
"//media:shared_memory_support",
"//mojo/environment:chromium",
"//sandbox",
Expand Down
1 change: 0 additions & 1 deletion content/content_common.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,6 @@
'../ipc/mojo/ipc_mojo.gyp:ipc_mojo',
'../media/media.gyp:media',
'../media/media.gyp:shared_memory_support',
'../media/midi/midi.gyp:midi',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
'../storage/storage_common.gyp:storage_common',
'../third_party/WebKit/public/blink.gyp:blink',
Expand Down
1 change: 0 additions & 1 deletion content/content_tests.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,6 @@
'../ipc/mojo/ipc_mojo.gyp:*',
'../media/blink/media_blink.gyp:media_blink',
'../media/media.gyp:media',
'../media/midi/midi.gyp:midi',
'../ppapi/ppapi_internal.gyp:ppapi_host',
'../ppapi/ppapi_internal.gyp:ppapi_proxy',
'../ppapi/ppapi_internal.gyp:ppapi_shared',
Expand Down
68 changes: 66 additions & 2 deletions media/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ config("media_config") {
if (use_cras) {
defines += [ "USE_CRAS" ]
}
if (use_alsa) {
defines += [ "USE_ALSA" ]
}
}

config("media_dependent_config") {
Expand Down Expand Up @@ -176,6 +179,30 @@ component("media") {
"formats/webm/webm_video_client.h",
"formats/webm/webm_webvtt_parser.cc",
"formats/webm/webm_webvtt_parser.h",
"midi/midi_manager.cc",
"midi/midi_manager.h",
"midi/midi_manager_mac.cc",
"midi/midi_manager_mac.h",
"midi/midi_manager_usb.cc",
"midi/midi_manager_usb.h",
"midi/midi_manager_win.cc",
"midi/midi_manager_win.h",
"midi/midi_message_queue.cc",
"midi/midi_message_queue.h",
"midi/midi_message_util.cc",
"midi/midi_message_util.h",
"midi/midi_port_info.cc",
"midi/midi_port_info.h",
"midi/midi_scheduler.cc",
"midi/midi_scheduler.h",
"midi/usb_midi_descriptor_parser.cc",
"midi/usb_midi_descriptor_parser.h",
"midi/usb_midi_device.h",
"midi/usb_midi_input_stream.cc",
"midi/usb_midi_input_stream.h",
"midi/usb_midi_jack.h",
"midi/usb_midi_output_stream.cc",
"midi/usb_midi_output_stream.h",
"renderers/audio_renderer_impl.cc",
"renderers/audio_renderer_impl.h",
"renderers/gpu_video_accelerator_factories.h",
Expand Down Expand Up @@ -316,6 +343,11 @@ component("media") {
]
} else {
sources += [
"midi/midi_manager_android.cc",
"midi/usb_midi_device_android.cc",
"midi/usb_midi_device_android.h",
"midi/usb_midi_device_factory_android.cc",
"midi/usb_midi_device_factory_android.h",
"video/capture/android/video_capture_device_android.cc",
"video/capture/android/video_capture_device_android.h",
"video/capture/android/video_capture_device_factory_android.cc",
Expand All @@ -336,6 +368,18 @@ component("media") {
]
}

if (use_alsa) {
libs += [ "asound" ]
sources += [
"midi/midi_manager_alsa.cc",
"midi/midi_manager_alsa.h",
]
}

if (use_udev) {
deps += [ "//device/udev_linux" ]
}

# A simple WebM encoder for animated avatars on ChromeOS.

if (use_ozone) {
Expand All @@ -359,6 +403,7 @@ component("media") {
"//third_party/decklink",
]
libs += [
"CoreMIDI.framework",
"CoreVideo.framework",
"OpenGL.framework",
"QTKit.framework",
Expand All @@ -377,6 +422,8 @@ component("media") {
}

if (is_win) {
deps += [ "//device/usb" ]

libs += [
"mf.lib",
"mfplat.lib",
Expand Down Expand Up @@ -528,6 +575,13 @@ test("media_unittests") {
"formats/webm/webm_parser_unittest.cc",
"formats/webm/webm_tracks_parser_unittest.cc",
"formats/webm/webm_webvtt_parser_unittest.cc",
"midi/midi_manager_unittest.cc",
"midi/midi_manager_usb_unittest.cc",
"midi/midi_message_queue_unittest.cc",
"midi/midi_message_util_unittest.cc",
"midi/usb_midi_descriptor_parser_unittest.cc",
"midi/usb_midi_input_stream_unittest.cc",
"midi/usb_midi_output_stream_unittest.cc",
"renderers/audio_renderer_impl_unittest.cc",
"renderers/renderer_impl_unittest.cc",
"renderers/video_renderer_impl_unittest.cc",
Expand Down Expand Up @@ -615,8 +669,18 @@ test("media_unittests") {
}

if (is_mac) {
sources +=
[ "video/capture/mac/video_capture_device_factory_mac_unittest.mm" ]
sources += [
"midi/midi_manager_mac_unittest.cc",
"video/capture/mac/video_capture_device_factory_mac_unittest.mm",
]
libs = [
# Required by midi_manager_mac_unittest.cc.
"CoreMIDI.framework",
]
}

if (use_alsa) {
sources += [ "midi/midi_manager_alsa_unittest.cc" ]
}

# include_dirs += [
Expand Down
5 changes: 5 additions & 0 deletions media/OWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,10 @@ scherkus@chromium.org
wolenetz@chromium.org
xhwang@chromium.org

# Build rules for Web MIDI
per-file BUILD.gn=toyoshim@chromium.org
per-file *.gyp=toyoshim@chromium.org
per-file *.gypi=toyoshim@chromium.org

per-file *.isolate=csharp@chromium.org
per-file *.isolate=maruel@chromium.org
2 changes: 2 additions & 0 deletions media/base/android/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ generate_jni("media_jni_headers") {
"java/src/org/chromium/media/MediaDrmBridge.java",
"java/src/org/chromium/media/MediaPlayerBridge.java",
"java/src/org/chromium/media/MediaPlayerListener.java",
"java/src/org/chromium/media/UsbMidiDeviceAndroid.java",
"java/src/org/chromium/media/UsbMidiDeviceFactoryAndroid.java",
"java/src/org/chromium/media/WebAudioMediaCodecBridge.java",
]
jni_package = "media"
Expand Down
4 changes: 2 additions & 2 deletions ...mium/media/midi/UsbMidiDeviceAndroid.java → .../chromium/media/UsbMidiDeviceAndroid.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

package org.chromium.media.midi;
package org.chromium.media;

import android.annotation.TargetApi;
import android.hardware.usb.UsbConstants;
Expand All @@ -27,7 +27,7 @@
* Owned by its native counterpart declared in usb_midi_device_android.h.
* Refer to that class for general comments.
*/
@JNINamespace("media::midi")
@JNINamespace("media")
class UsbMidiDeviceAndroid {
/**
* A connection handle for this device.
Expand Down
Loading

0 comments on commit 60006f2

Please sign in to comment.