Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
[Temp] Only depend on devices/vr when enable_webvr is on.
Browse files Browse the repository at this point in the history
This is a backport of some of the build system bits of
http://crrev.com/2219203002 ("Migrate WebVR Cardboard implementation to
GVR"): we are not interested in the "move to GVR" part, but this change
also makes the dependency on some devices/vr targets optional based on
the value of `enable_webvr`, which is something we want in order to be
able to build Crosswalk with that flag off.

This commit will not be necessary once we move to M54 and incorporate
the CL mentioned above.

BUG=XWALK-6746
  • Loading branch information
rakuco committed Oct 11, 2016
1 parent 689f300 commit 6f48440
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
5 changes: 4 additions & 1 deletion content/public/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ android_library("content_java") {
"//device/usb:java",
"//device/vibration:mojo_bindings_java",
"//device/vibration/android:vibration_manager_android",
"//device/vr:java",
"//media/base/android:media_java",
"//media/capture/video/android:capture_java",
"//media/midi:midi_java",
Expand All @@ -57,6 +56,10 @@ android_library("content_java") {
#"//content:content_common",
]

if (enable_webvr) {
deps += [ "//device/vr:java" ]
}

srcjar_deps = [
":common_aidl",
":content_public_android_java_enums_srcjar",
Expand Down
13 changes: 9 additions & 4 deletions device/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ test("device_unittests") {
"nfc/nfc_chromeos_unittest.cc",
"nfc/nfc_ndef_record_unittest.cc",
"test/run_all_unittests.cc",
"vr/vr_device_manager_unittest.cc",
]

deps = [
Expand All @@ -76,9 +75,6 @@ test("device_unittests") {
"//device/gamepad:test_helpers",
"//device/nfc",
"//device/power_save_blocker",
"//device/vr",
"//device/vr:fakes",
"//device/vr:mojo_bindings",
"//mojo/common",
"//mojo/edk/system",
"//mojo/public/cpp/bindings",
Expand Down Expand Up @@ -221,6 +217,15 @@ test("device_unittests") {
"bluetooth/bluetooth_low_energy_win_fake.h",
]
}

if (enable_webvr) {
sources += [ "vr/vr_device_manager_unittest.cc" ]
deps += [
"//device/vr",
"//device/vr:fakes",
"//device/vr:mojo_bindings",
]
}
}

if (is_android) {
Expand Down

0 comments on commit 6f48440

Please sign in to comment.