diff options
| author | Daniel Adams <70986246+msub2@users.noreply.github.com> | 2024-07-23 22:00:50 -1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-24 08:00:50 +0000 |
| commit | e425ad0cb722b01420ddc315492d13067828250e (patch) | |
| tree | 87baeefaa138eeb3bcd3c7cc0a4938d782f17952 /python/servo | |
| parent | b6652f88d163fe38982a9d2bb2f797a349559288 (diff) | |
| download | servo-e425ad0cb722b01420ddc315492d13067828250e.tar.gz servo-e425ad0cb722b01420ddc315492d13067828250e.zip | |
Remove googlevr feature (#32840)
* 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>
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 7 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 2dc335236c3..93a432041df 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -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 diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 1190da22b39..a9470b7b372 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -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 |