diff options
| author | Vincent Scheib <scheib@chromium.org> | 2015-09-14 12:16:03 -0700 |
|---|---|---|
| committer | Vincent Scheib <scheib@chromium.org> | 2015-09-14 19:17:48 +0000 |
| commit | 272663a2eb5b13efdeafbf161cf9c9ff17297a0c (patch) | |
| tree | 96e09b942e1d24ebe284dac81a7330ad5e007368 | |
| parent | f9d1508df355a4d68577421e39451a894480eb3e (diff) | |
| download | chromium_src-272663a2eb5b13efdeafbf161cf9c9ff17297a0c.zip chromium_src-272663a2eb5b13efdeafbf161cf9c9ff17297a0c.tar.gz chromium_src-272663a2eb5b13efdeafbf161cf9c9ff17297a0c.tar.bz2 | |
Merge to 45: bluetooth: android: Add java build dependencies.
ChromePublic.apk when built from internal Chrome code failed to include
these dependencies, and would encounter runtime errors with
ClassNotFoundException.
BUG=490430, 531616
Initial Review URL: https://codereview.chromium.org/1231883004
Cr-Commit-Position: refs/heads/master@{#338534}
(cherry picked from commit 3a7891028f1357bc869a9495df6bff3da2944265)
TBR=kerz@chromium.org
Review URL: https://codereview.chromium.org/1333153004 .
Cr-Commit-Position: refs/branch-heads/2454@{#473}
Cr-Branched-From: 12bfc3360892ec53cd00fc239a47e5298beb063b-refs/heads/master@{#338390}
| -rw-r--r-- | content/content.gyp | 1 | ||||
| -rw-r--r-- | content/public/android/BUILD.gn | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/content/content.gyp b/content/content.gyp index 9ce90ef..efcbf74 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -430,6 +430,7 @@ 'dependencies': [ '../base/base.gyp:base', '../device/battery/battery.gyp:device_battery_java', + '../device/bluetooth/bluetooth.gyp:device_bluetooth_java', '../device/vibration/vibration.gyp:device_vibration_java', '../media/media.gyp:media_java', '../mojo/mojo_base.gyp:mojo_application_bindings', diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn index 663ccf6..9872700 100644 --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn @@ -34,6 +34,7 @@ android_library("content_java") { "//base:base_java", "//device/battery/android:battery_monitor_android", "//device/battery:mojo_bindings_java", + "//device/bluetooth:java", "//media/base/android:media_java", "//media/midi:midi_java", "//mojo/android:system_java", |