Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove googlevr feature (#32840)

Browse source 
* Remove googlevr feature

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Remove googlevr and oculusvr from python scripts

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Remove vr checks entirely

Signed-off-by: Daniel Adams <msub2official@gmail.com>

---------

Signed-off-by: Daniel Adams <msub2official@gmail.com>
This commit is contained in:
Daniel Adams 2024-07-23 22:00:50 -10:00 • committed by GitHub
parent b6652f88d1
commit e425ad0cb7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 3 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Cargo.lock generated
View file

@ -124,12 +124,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]]
name = "android_injected_glue"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80b9e34fcbf29c0563547cb2ecce9b49504597cad6166769b1e4efb45c6c2951"
[[package]]
name = "android_log-sys"
version = "0.3.1"
@ -2652,12 +2646,6 @@ dependencies = [
"system-deps",
]
[[package]]
name = "gvr-sys"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2a8e6ed12756f9e5fd8d50019e4f6839f50cf95f82657353e9d860730a5f797"
[[package]]
name = "h2"
version = "0.3.26"
@ -7367,12 +7355,10 @@ name = "webxr"
version = "0.0.1"
source = "git+https://github.com/servo/webxr#bacb22faec8aa469ff6454bf0434d3b89fe419a3"
dependencies = [
"android_injected_glue",
"bindgen",
"crossbeam-channel",
"euclid",
"gl_generator",
"gvr-sys",
"log",
"openxr",
"serde",

1
components/servo/Cargo.toml
View file

@ -13,7 +13,6 @@ crate-type = ["rlib"]
[features]
debugmozjs = ["script/debugmozjs"]
googlevr = ["webxr/googlevr"]
jitspew = ["script/jitspew"]
js_backtrace = ["script/js_backtrace"]
layout_2013 = ["dep:layout_thread_2013"]

7
python/servo/build_commands.py
View file

@ -140,13 +140,8 @@ class MachCommands(CommandBase):
)
if self.is_android_build and not no_package:
flavor = None
if "googlevr" in self.features:
flavor = "googlevr"
elif "oculusvr" in self.features:
flavor = "oculusvr"
rv = Registrar.dispatch("package", context=self.context, build_type=build_type,
target=self.cross_compile_target, flavor=flavor)
target=self.cross_compile_target, flavor=None)
if rv:
return rv

8
python/servo/package_commands.py
View file

@ -82,7 +82,7 @@ def copy_windows_dependencies(binary_path, destination):
shutil.copy(path.join(binary_path, f), destination)
def change_prefs(resources_path, platform, vr=False):
def change_prefs(resources_path, platform):
print("Swapping prefs")
prefs_path = path.join(resources_path, "prefs.json")
package_prefs_path = path.join(resources_path, "package-prefs.json")
@ -92,8 +92,6 @@ def change_prefs(resources_path, platform, vr=False):
package_prefs = json.load(package_prefs)
if "all" in package_prefs:
pref_sets += [package_prefs["all"]]
if vr and "vr" in package_prefs:
pref_sets += [package_prefs["vr"]]
if platform in package_prefs:
pref_sets += [package_prefs[platform]]
for pref_set in pref_sets:
@ -183,14 +181,12 @@ class PackageCommands(CommandBase):
if flavor is not None:
flavor_name = flavor.title()
vr = flavor == "googlevr" or flavor == "oculusvr"
dir_to_resources = path.join(self.get_top_dir(), 'target', 'android', 'resources')
if path.exists(dir_to_resources):
delete(dir_to_resources)
shutil.copytree(path.join(dir_to_root, 'resources'), dir_to_resources)
change_prefs(dir_to_resources, "android", vr=vr)
change_prefs(dir_to_resources, "android")
variant = ":assemble" + flavor_name + arch_string + build_type_string
apk_task_name = ":servoapp" + variant