diff options
| author | Nico Weber <thakis@chromium.org> | 2014-12-23 16:34:59 -0800 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2014-12-24 00:36:30 +0000 |
| commit | fc38eeb37ff940849dd4e577b5e20b6598f38859 (patch) | |
| tree | 5f1d5534e78cdf46d0c5163deac7f25eb9ad76ae /device | |
| parent | 5a24328a073d1cf48b43c33def640c2f3a5dadad (diff) | |
| download | chromium_src-fc38eeb37ff940849dd4e577b5e20b6598f38859.zip chromium_src-fc38eeb37ff940849dd4e577b5e20b6598f38859.tar.gz chromium_src-fc38eeb37ff940849dd4e577b5e20b6598f38859.tar.bz2 | |
Fix android gn builds.
android_chromium_gn_compile_dbg is red failing to compile a cc file:
In file included from ../../device/vibration/android/vibration_jni_registrar.cc:9:0:
../../device/vibration/vibration_manager_impl_android.h:9:54: fatal error: device/vibration/vibration_manager.mojom.h: No such file or directory
#include "device/vibration/vibration_manager.mojom.h"
^
This was added with incorrect dependencies in
https://codereview.chromium.org/583663003/ two weeks ago, but
apparently no clobber happened since then. The problem can be
reproduced locally by running
rm -rf out/Debug
gn gen out/Debug --args=is_debug=true\ os=\"android\"\ cpu_arch=\"arm\"\ use_goma=true\ goma_dir=\"$HOME/goma\"
ninja -C out/Debug obj/device/vibration/android/android.vibration_jni_registrar.o
BUG=none
R=dcheng@chromium.org
Review URL: https://codereview.chromium.org/826593003
Cr-Commit-Position: refs/heads/master@{#309591}
Diffstat (limited to 'device')
| -rw-r--r-- | device/vibration/android/BUILD.gn | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/device/vibration/android/BUILD.gn b/device/vibration/android/BUILD.gn index 538e24c..d0fa7e9 100644 --- a/device/vibration/android/BUILD.gn +++ b/device/vibration/android/BUILD.gn @@ -12,6 +12,13 @@ source_set("android") { "vibration_jni_registrar.cc", "vibration_jni_registrar.h", ] + + deps = [ + # vibration_jni_registrar.cc includes a header from device/vibration + # that includes a mojo-generated header file. Make sure the header + # is generated before vibration_jni_registrar.cc is compiled. + "//device/vibration:mojo_bindings", + ] } generate_jni("vibration_jni_headers") { |