diff options
| author | Jonathan Schwender <55576758+jschwe@users.noreply.github.com> | 2024-09-26 08:58:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-26 06:58:30 +0000 |
| commit | 7fdaccde5501283708503e9a64efa578ac9ae7f7 (patch) | |
| tree | 40cf4ad30bd49dc5b91ac97ea889270b478f5458 /python/servo/platform | |
| parent | a97afebdcc7a06201638c45a9c7e4b7aab25203a (diff) | |
| download | servo-7fdaccde5501283708503e9a64efa578ac9ae7f7.tar.gz servo-7fdaccde5501283708503e9a64efa578ac9ae7f7.zip | |
ohos: Support product flavors (#33512)
* ohos: Support product flavors
Support different product flavors (e.g. with different signing
configurations) by supporting --flavor on ohos.
The flavor influences the package path for OH packages, so
allow the flavor parameter on build + package + install
Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
* Fix smoketest
Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>
---------
Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>
Diffstat (limited to 'python/servo/platform')
| -rw-r--r-- | python/servo/platform/build_target.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/python/servo/platform/build_target.py b/python/servo/platform/build_target.py index ecdb6c71c13..2118e2e1efe 100644 --- a/python/servo/platform/build_target.py +++ b/python/servo/platform/build_target.py @@ -382,11 +382,13 @@ class OpenHarmonyTarget(CrossBuildTarget): def needs_packaging(self) -> bool: return True - def get_package_path(self, build_type_directory: str) -> str: + def get_package_path(self, build_type_directory: str, flavor: Optional[str] = None) -> str: base_path = util.get_target_dir() base_path = path.join(base_path, "openharmony", self.triple()) hap_name = "servoshell-default-signed.hap" - build_output_path = path.join("entry", "build", "default", "outputs", "default") + if not flavor: + flavor = "default" + build_output_path = path.join("entry", "build", flavor, "outputs", "default") return path.join(base_path, build_type_directory, build_output_path, hap_name) def abi_string(self) -> str: |