From 4890544527728beb859cd7c5c03069271dfdc3b6 Mon Sep 17 00:00:00 2001 From: curried Date: Mon, 11 Aug 2025 19:41:11 +0800 Subject: [PATCH] Revert "!1459 fix compile codex" This reverts commit 76746cecc7f2a88cf8d1d402977467795f85b051, reversing changes made to 3ce296a7808c8c6d2a135f745de0ed7733af9d96. Conflicts: services/ui/BUILD.gn Signed-off-by: curried --- services/ui/BUILD.gn | 19 ------------------- services/ui/copy_ui_extend_cfg.py | 26 -------------------------- 2 files changed, 45 deletions(-) delete mode 100644 services/ui/copy_ui_extend_cfg.py diff --git a/services/ui/BUILD.gn b/services/ui/BUILD.gn index 1b31d65c..25c0d351 100644 --- a/services/ui/BUILD.gn +++ b/services/ui/BUILD.gn @@ -38,19 +38,6 @@ config("updater_ui_support_cfg") { } } -if (defined(updater_ui_extend_cfg)) { - action("copy_ui_extend_cfg") { - script = "copy_ui_extend_cfg.py" - updater_ui_extend_cfg_target_path = "${target_gen_dir}/" + updater_ui_extend_cfg_name - sources = [ updater_ui_extend_cfg ] - outputs = [ "${target_gen_dir}/test.txt" ] - args = [ - rebase_path(updater_ui_extend_cfg, "."), - rebase_path(updater_ui_extend_cfg_target_path, "."), - ] - } -} - ohos_static_library("libui") { public_configs = [ ":updater_ui_support_cfg" ] @@ -110,12 +97,6 @@ ohos_static_library("libui") { "${updater_path}/utils:libutils", ] - if (defined(updater_ui_extend_cfg)) { - deps += [ "${updater_path}/services/ui:copy_ui_extend_cfg" ] - updater_ui_extend_cfg_target_path = "${target_gen_dir}/" + updater_ui_extend_cfg_name - include_dirs += [ updater_ui_extend_cfg_target_path ] - } - external_deps = [ "bounds_checking_function:libsec_static", "cJSON:cjson", diff --git a/services/ui/copy_ui_extend_cfg.py b/services/ui/copy_ui_extend_cfg.py deleted file mode 100644 index f109ea6e..00000000 --- a/services/ui/copy_ui_extend_cfg.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Copyright (c) 2025 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os -import shutil -import sys - -os.chdir(os.path.dirname(__file__)) - -if __name__ == '__main__': - src_path = sys.argv[1] - tgt_path = sys.argv[2] - shutil.copy(src_path, tgt_path) \ No newline at end of file -- Gitee