Move vr features.gni into its own directory.
This fixes some weird issues we were encountering, where we had to hide some build targets behind (!is_ios) after adding our features target to ui/gfx.
I'm not sure if any extra code was being compiled in, but asserts in gn files were being hit related to things that shouldn't be included on ios.
It seems other features have already done this sort of thing.
[email protected]
BUG=
Review-Url: https://codereview.chromium.org/2840563004
Cr-Commit-Position: refs/heads/master@{#467113}
Committed: https://chromium.googlesource.com/chromium/src/+/faae24707ba8852ea92b56bcf77aa19878aacdab
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation
Review-Url: https://codereview.chromium.org/2840563004
Cr-Commit-Position: refs/heads/master@{#467167}
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index c2b244d..f7be83ed 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -11,7 +11,7 @@
import("//chrome/chrome_paks.gni")
import("//chrome/common/features.gni")
import("//chrome/process_version_rc_template.gni") # For branding_file_path.
-import("//device/vr/features.gni")
+import("//device/vr/features/features.gni")
import("//testing/test.gni")
import("//third_party/icu/config.gni")
import("//third_party/protobuf/proto_library.gni")
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index ae72f49f..2d402198 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -10,7 +10,7 @@
import("//chrome/common/features.gni")
import("//components/os_crypt/features.gni")
import("//components/spellcheck/spellcheck_build_features.gni")
-import("//device/vr/features.gni")
+import("//device/vr/features/features.gni")
import("//extensions/features/features.gni")
import("//media/media_options.gni")
import("//net/features.gni")
@@ -1608,7 +1608,7 @@
"//device/power_save_blocker",
"//device/usb/mojo",
"//device/usb/public/interfaces",
- "//device/vr:features",
+ "//device/vr/features",
"//extensions/features",
"//gin:gin_features",
"//google_apis",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index ca33be37..cb576af5 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -22,7 +22,7 @@
"+device/media_transfer_protocol",
"+device/power_save_blocker",
"+device/usb",
- "+device/vr/features.h",
+ "+device/vr/features/features.h",
"+extensions/browser",
"+extensions/common",
"+extensions/components/javascript_dialog_extensions_client",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 75c885e..8b843be 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -76,7 +76,7 @@
#include "content/public/common/feature_h264_with_openh264_ffmpeg.h"
#include "content/public/common/features.h"
#include "device/base/features.h"
-#include "device/vr/features.h"
+#include "device/vr/features/features.h"
#include "extensions/features/features.h"
#include "gin/public/gin_features.h"
#include "gpu/config/gpu_switches.h"
diff --git a/chrome/browser/android/DEPS b/chrome/browser/android/DEPS
index 9da1a1a6..bb55a8c 100644
--- a/chrome/browser/android/DEPS
+++ b/chrome/browser/android/DEPS
@@ -9,7 +9,7 @@
"+components/sync/test/fake_server/android",
"+components/toolbar",
"+components/web_contents_delegate_android",
- "+device/vr/features.h",
+ "+device/vr/features/features.h",
"+sandbox/linux/seccomp-bpf/sandbox_bpf.h",
"+sandbox/sandbox_features.h",
"+third_party/gvr-android-sdk",
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index 9017b02..cdd7a13 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -190,7 +190,7 @@
#include "components/url_formatter/android/component_jni_registrar.h"
#include "components/variations/android/component_jni_registrar.h"
#include "components/web_contents_delegate_android/component_jni_registrar.h"
-#include "device/vr/features.h"
+#include "device/vr/features/features.h"
#include "printing/features/features.h"
#if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW)
diff --git a/chrome/browser/android/vr_shell/BUILD.gn b/chrome/browser/android/vr_shell/BUILD.gn
index 5c9e0f87..dc166f9 100644
--- a/chrome/browser/android/vr_shell/BUILD.gn
+++ b/chrome/browser/android/vr_shell/BUILD.gn
@@ -4,7 +4,7 @@
import("//build/config/android/rules.gni")
import("//chrome/common/features.gni")
-import("//device/vr/features.gni")
+import("//device/vr/features/features.gni")
import("//testing/test.gni")
assert(enable_vr)
diff --git a/chrome/common/DEPS b/chrome/common/DEPS
index b0596a6d..bc3c673 100644
--- a/chrome/common/DEPS
+++ b/chrome/common/DEPS
@@ -28,7 +28,7 @@
"+components/translate/core/common",
"+components/url_formatter",
"+components/version_info",
- "+device/vr/features.h",
+ "+device/vr/features/features.h",
"+extensions/common",
"+extensions/features",
"+gin/public", # For profiling.cc
diff --git a/chrome/common/features.gni b/chrome/common/features.gni
index 9364bd9..b302e5d7 100644
--- a/chrome/common/features.gni
+++ b/chrome/common/features.gni
@@ -6,7 +6,7 @@
import("//build/config/chromecast_build.gni")
import("//build/config/compiler/compiler.gni")
import("//build/config/features.gni")
-import("//device/vr/features.gni")
+import("//device/vr/features/features.gni")
import("//extensions/features/features.gni")
import("//media/media_options.gni")
import("//net/features.gni")
