Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(834)

Unified Diff: device/vr/BUILD.gn

Issue 2219203002: Migrate WebVR Cardboard implementation to GVR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gvr_third_party
Patch Set: Disabling WebVR on non-component builds Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/vr/BUILD.gn
diff --git a/device/vr/BUILD.gn b/device/vr/BUILD.gn
index f82ea8b94000e776123468c74e9a6540e2f456cc..8752d2793f34f2e37f42b2bdb447ef1aa964af36 100644
--- a/device/vr/BUILD.gn
+++ b/device/vr/BUILD.gn
@@ -34,13 +34,19 @@ component("vr") {
if (is_android) {
sources += [
- "android/cardboard/cardboard_vr_device.cc",
- "android/cardboard/cardboard_vr_device.h",
- "android/cardboard/cardboard_vr_device_provider.cc",
- "android/cardboard/cardboard_vr_device_provider.h",
+ "android/gvr/gvr_api_manager.cc",
+ "android/gvr/gvr_api_manager.h",
+ "android/gvr/gvr_device.cc",
+ "android/gvr/gvr_device.h",
+ "android/gvr/gvr_device_provider.cc",
+ "android/gvr/gvr_device_provider.h",
]
- deps += [ ":jni_headers" ]
+ deps += [
+ ":jni_headers",
+ "//third_party/gvr-android-sdk:libgvr",
+ ]
+ configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
}
}
@@ -55,6 +61,7 @@ static_library("fakes") {
]
public_deps = [
+ ":mojo_bindings",
":vr",
"//base",
"//mojo/public/cpp/bindings",
@@ -71,7 +78,7 @@ mojom("mojo_bindings") {
if (is_android) {
java_sources_needing_jni =
- [ "android/java/src/org/chromium/device/vr/CardboardVRDevice.java" ]
+ [ "android/java/src/org/chromium/device/vr/GvrDeviceProvider.java" ]
generate_jni("jni_headers") {
sources = java_sources_needing_jni
@@ -82,7 +89,8 @@ if (is_android) {
java_files = java_sources_needing_jni
deps = [
"//base:base_java",
- "//third_party/cardboard-java:cardboard-java",
+ "//third_party/android_protobuf:protobuf_nano_javalib",
+ "//third_party/gvr-android-sdk:gvr_common_java",
]
}
}
« build/config/features.gni ('K') | « device/BUILD.gn ('k') | device/vr/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698