From 73155fc885dec068c6096eef9fdef9f4b61f720b Mon Sep 17 00:00:00 2001 From: chencheng31 Date: Wed, 22 Dec 2021 14:56:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=9F=E6=88=90sysResource.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chencheng31 --- BUILD.gn | 10 +++++----- generateSysResource.py | 0 2 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 generateSysResource.py diff --git a/BUILD.gn b/BUILD.gn index 0535ce60d..176943439 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -111,7 +111,7 @@ action("build_ets_loader_library") { } action("build_ets_sysResource") { - script = "//foundation/ace/huawei_proprietary/tools/ets-loader/generateSysResource.py" + script = "//developtools/ace-ets2bundle/generateSysResource.py" outputs = [ ets_sysResource ] _id_defined_json = @@ -137,10 +137,10 @@ ohos_copy("ets_loader") { "compiler/webpack.config.js", ets_loader_component_config_file, ] - if (!is_standard_system) { - deps += [ ":build_ets_sysResource" ] - sources += [ ets_sysResource ] - } + + deps += [ ":build_ets_sysResource" ] + sources += [ ets_sysResource ] + outputs = [ target_out_dir + "/$target_name/{{source_file_part}}" ] module_source_dir = target_out_dir + "/$target_name" module_install_name = "" diff --git a/generateSysResource.py b/generateSysResource.py old mode 100644 new mode 100755 -- Gitee From f34b7844ffb9e661cec8a80a2f58ba6d5d92ef8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=A8=8B?= Date: Wed, 22 Dec 2021 07:57:51 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=9F=E6=88=90sysResource.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chencheng31 chencheng8@huawei.com --- generateSysResource.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/generateSysResource.py b/generateSysResource.py index 2a80ebe7b..5f8e0c1e8 100755 --- a/generateSysResource.py +++ b/generateSysResource.py @@ -1,4 +1,5 @@ -# /* +#!/usr/bin/env python +# -*- coding: utf-8 -*- # Copyright (c) 2021 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. @@ -12,9 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -#!/usr/bin/env python -# -*- coding: utf-8 -*- - import json import os import argparse -- Gitee From 17f5c9944b92d4ce1f6971cd876ccec45c7fae3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=A8=8B?= Date: Fri, 24 Dec 2021 02:33:28 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=9F=E6=88=90sysResource.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chencheng31 --- generateSysResource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generateSysResource.py b/generateSysResource.py index 5f8e0c1e8..e3bcdb991 100755 --- a/generateSysResource.py +++ b/generateSysResource.py @@ -41,7 +41,7 @@ class SysResource: continue item_name = item["name"] - item_id = item["order"] + 0x7000000 + item_id = item["order"] + 0x7800000 if item_type not in self.records: self.records[item_type] = dict() self.records[item_type][item_name] = item_id -- Gitee