diff --git a/BUILD.gn b/BUILD.gn index 0535ce60da5f4a838483b6f64b57ef30be3d1522..1769434390bef5f962684af83699f01ea4272755 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 index 2a80ebe7bd02f0896dc54f4345528d167bed78d1..e3bcdb991417420649dd47c3878be544859951c8 --- 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 @@ -43,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