From 4cddd6096c9cde8f113335eac015e5de01cc7ef1 Mon Sep 17 00:00:00 2001 From: laibo102 Date: Thu, 10 Mar 2022 15:10:14 +0800 Subject: [PATCH 1/5] update:BUILD.gn Signed-off-by: laibo102 Change-Id: I3caedfbfe34635ddf97d6a729698b8b1eb002543 --- BUILD.gn | 20 ++++++++++---------- interface_config.gni | 9 +++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 interface_config.gni diff --git a/BUILD.gn b/BUILD.gn index e1313d198c..462abaa12d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -14,6 +14,7 @@ import("//build/ohos.gni") import("//build/ohos/notice/notice.gni") import("//build/templates/metadata/module_info.gni") +import("interface_config.gni") ohos_copy("ets_internal_api") { sources = [ @@ -119,20 +120,19 @@ ohos_copy("ets_component") { } ohos_copy("common_api") { - sources = [ - "api/@ohos.wifi.d.ts", - "api/common/@system.app.d.ts", - "api/common/@system.configuration.d.ts", - "api/common/@system.file.d.ts", - "api/common/@system.mediaquery.d.ts", - "api/common/@system.prompt.d.ts", - "api/common/@system.router.d.ts", - ] + sources = common_api_src outputs = [ target_out_dir + "/$target_name/{{source_file_part}}" ] module_source_dir = target_out_dir + "/$target_name" module_install_name = "" } +ohos_copy("common_api_ark") { + sources = common_api_src + outputs = + [ target_out_dir + "/../../developtools/api/{{source_file_part}}" ] + module_install_name = "" +} + ohos_copy("bundle_api") { sources = [ "api/bundle/bundleStatusCallback.d.ts" ] outputs = [ target_out_dir + "/$target_name/{{source_file_part}}" ] @@ -144,7 +144,7 @@ template("ohos_declaration_template") { forward_variables_from(invoker, "*") action_with_pydeps(target_name) { script = "//interface/sdk-js/remove_internal.py" - outputs = [ root_out_dir + "/$target_name/" ] + outputs = [ root_out_dir + "/ohos_declaration/$target_name" ] args = [ "--input", rebase_path("//interface/sdk-js/api", root_build_dir), diff --git a/interface_config.gni b/interface_config.gni new file mode 100644 index 0000000000..5deecb9305 --- /dev/null +++ b/interface_config.gni @@ -0,0 +1,9 @@ +common_api_src = [ + "//interface/sdk-js/api/@ohos.wifi.d.ts", + "//interface/sdk-js/api/common/@system.app.d.ts", + "//interface/sdk-js/api/common/@system.configuration.d.ts", + "//interface/sdk-js/api/common/@system.file.d.ts", + "//interface/sdk-js/api/common/@system.mediaquery.d.ts", + "//interface/sdk-js/api/common/@system.prompt.d.ts", + "//interface/sdk-js/api/common/@system.router.d.ts", +] \ No newline at end of file -- Gitee From 6f25431bb3846552127db962adca4e81b8bb3ccd Mon Sep 17 00:00:00 2001 From: laibo102 Date: Fri, 11 Mar 2022 12:03:56 +0800 Subject: [PATCH 2/5] update: BUILD.gn Signed-off-by: laibo102 Change-Id: I275f393f6a5804b4591bdee230c2cfd3a3dbc40b --- BUILD.gn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 462abaa12d..8c25b9b03f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -128,8 +128,7 @@ ohos_copy("common_api") { ohos_copy("common_api_ark") { sources = common_api_src - outputs = - [ target_out_dir + "/../../developtools/api/{{source_file_part}}" ] + outputs = [ target_out_dir + "/../../developtools/api/{{source_file_part}}" ] module_install_name = "" } -- Gitee From dd93be6677bad75f770d00f84331171a5f68b29b Mon Sep 17 00:00:00 2001 From: laibo102 Date: Fri, 11 Mar 2022 14:31:51 +0800 Subject: [PATCH 3/5] update: BUILD.gn Signed-off-by: laibo102 Change-Id: I09200e8c9029c7a84b97d5a59674772552e90020 --- interface_config.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface_config.gni b/interface_config.gni index 5deecb9305..8001c8f484 100644 --- a/interface_config.gni +++ b/interface_config.gni @@ -6,4 +6,4 @@ common_api_src = [ "//interface/sdk-js/api/common/@system.mediaquery.d.ts", "//interface/sdk-js/api/common/@system.prompt.d.ts", "//interface/sdk-js/api/common/@system.router.d.ts", -] \ No newline at end of file +] -- Gitee From b8644150723620a87bf2a44d3ba74c615b9d8f6a Mon Sep 17 00:00:00 2001 From: laibo102 Date: Fri, 11 Mar 2022 16:17:52 +0800 Subject: [PATCH 4/5] update: BUILD.gn Signed-off-by: laibo102 Change-Id: Ib3e5403ed07c6d186a452382507211804f2b21ae --- interface_config.gni | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/interface_config.gni b/interface_config.gni index 8001c8f484..f28ccc6129 100644 --- a/interface_config.gni +++ b/interface_config.gni @@ -1,3 +1,16 @@ +# 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. +# 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. + common_api_src = [ "//interface/sdk-js/api/@ohos.wifi.d.ts", "//interface/sdk-js/api/common/@system.app.d.ts", -- Gitee From b6ba84e7fea26ded52ea9a9891a918b29ce82410 Mon Sep 17 00:00:00 2001 From: laibo102 Date: Fri, 11 Mar 2022 16:47:45 +0800 Subject: [PATCH 5/5] update: BUILD.gn Signed-off-by: laibo102 Change-Id: I8288b287dc705f7c6b8db2838a9e3c8af528c49b --- BUILD.gn | 6 ------ 1 file changed, 6 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 8c25b9b03f..c43dd8acae 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -126,12 +126,6 @@ ohos_copy("common_api") { module_install_name = "" } -ohos_copy("common_api_ark") { - sources = common_api_src - outputs = [ target_out_dir + "/../../developtools/api/{{source_file_part}}" ] - module_install_name = "" -} - ohos_copy("bundle_api") { sources = [ "api/bundle/bundleStatusCallback.d.ts" ] outputs = [ target_out_dir + "/$target_name/{{source_file_part}}" ] -- Gitee