0

Reland: Web MIDI: split build rules for media/midi

Changes from the first coommit.
- Define right dependencies to xdisplaycheck
- Fix build rules for midi_unittests_apk to run on Android
- Rebase error fixes (build rule deopendency adjustments)

Original commit is:
https://crrev.com/31624cad1a3b5cf26950b864837ba44b3aa38331

Original description follows:

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
TEST=ninja midi_unittests_apk && ./build/android/test_runner.py gtest midi_unittests

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

Cr-Commit-Position: refs/heads/master@{#327712}
This commit is contained in:
toyoshim
2015-04-30 07:52:02 -07:00
committed by Commit bot
parent 3140c71945
commit c647577999
42 changed files with 782 additions and 182 deletions

@ -7,4 +7,5 @@ include_rules = [
"+gin/public/snapshot_fd_data.h",
"+gin/v8_initializer.h",
"+media/base", # For initializing media library.
"+media/midi", # For initializing midi library.
]

@ -24,6 +24,7 @@
#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"
@ -70,6 +71,9 @@ bool EnsureJniRegistered(JNIEnv* env) {
if (!media::RegisterJni(env))
return false;
if (!media::midi::RegisterJni(env))
return false;
if (!ui::RegisterUIAndroidJni(env))
return false;