diff options
| author | aboxhall <aboxhall@chromium.org> | 2015-04-22 11:27:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-22 18:28:03 +0000 |
| commit | 60006f2c430e17fc8338ff370a1c88cdc61b7f07 (patch) | |
| tree | 01d2ba0ea41642182ccceb4a63268849e0df25b3 /content/app | |
| parent | 15426e1f537cb15a28396c6ba70644fd90605218 (diff) | |
| download | chromium_src-60006f2c430e17fc8338ff370a1c88cdc61b7f07.zip chromium_src-60006f2c430e17fc8338ff370a1c88cdc61b7f07.tar.gz chromium_src-60006f2c430e17fc8338ff370a1c88cdc61b7f07.tar.bz2 | |
Revert of Web MIDI: split build rules for media/midi (patchset #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}
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/DEPS | 1 | ||||
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/content/app/DEPS b/content/app/DEPS index e9e2ea4..b6d8307 100644 --- a/content/app/DEPS +++ b/content/app/DEPS @@ -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. ] diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index 1b19303..930da5e 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -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" @@ -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; |