diff --git a/BUILD.gn b/BUILD.gn index 1ebada10b2dcd78d3bc9f2cef2f1a91368e3944b..24812e625013bfbdcc8b29631db2b314afd6bab4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -145,6 +145,23 @@ ohos_declaration_template("ohos_declaration_ets") { sdk_type = "ets" } +ohos_copy("ohos_declaration_ets_ark") { + deps = [ ":ohos_declaration_ets" ] + sources = + [ root_out_dir + "/ohos_declaration/${sdk_type}/ohos_declaration_ets" ] + + outputs = [ target_out_dir + "/../api" ] +} + +ohos_prebuilt_etc("ohos_declaration_ets_etc") { + source = "OAT.xml" + deps = [ ":ohos_declaration_ets_ark" ] + install_enable = false + output = string_replace(source, "OAT", "ohos_declaration_ets_etc") + part_name = "sdk" + subsystem_name = "sdk" +} + # ets2/api执行脚本 ohos_declaration_template("ohos_declaration_ets2") { sdk_type = "ets2" @@ -156,12 +173,30 @@ ohos_copy_internal("ets_internal_api") { iv_input = interface_sdk_path_ets1 + "/api/@internal/ets" } +ohos_prebuilt_etc("ets_internal_api_etc") { + source = "OAT.xml" + deps = [ ":ets_internal_api" ] + install_enable = false + output = string_replace(source, "OAT", "ets_internal_api_etc") + part_name = "sdk" + subsystem_name = "sdk" +} + # ets/arkts执行脚本 ohos_copy_internal("bundle_arkts") { sdk_type = "ets" iv_input = interface_sdk_path_ets1 + "/arkts" } +ohos_prebuilt_etc("bundle_arkts_etc") { + source = "OAT.xml" + deps = [ ":bundle_arkts" ] + install_enable = false + output = string_replace(source, "OAT", "bundle_arkts_etc") + part_name = "sdk" + subsystem_name = "sdk" +} + # ets1.2/arkts执行脚本 ohos_copy_internal("bundle_arkts_ets1.2") { sdk_type = "ets2" @@ -191,6 +226,15 @@ ohos_copy_internal("ets_component") { iv_input = interface_sdk_path_ets1 + "/api/@internal/component/ets" } +ohos_prebuilt_etc("ets_component_etc") { + source = "OAT.xml" + deps = [ ":ets_component" ] + install_enable = false + output = string_replace(source, "OAT", "ets_component_etc") + part_name = "sdk" + subsystem_name = "sdk" +} + # ets1.2/arkui/component执行脚本 ohos_copy_internal("ets_component2") { sdk_type = "ets2" @@ -203,6 +247,15 @@ ohos_copy_internal("bundle_kits") { iv_input = interface_sdk_path_ets1 + "/kits" } +ohos_prebuilt_etc("bundle_kits_etc") { + source = "OAT.xml" + deps = [ ":bundle_kits" ] + install_enable = false + output = string_replace(source, "OAT", "ohos_prebuilt_etc") + part_name = "sdk" + subsystem_name = "sdk" +} + # ets2/kits执行脚本 ohos_copy_internal("bundle_kits2") { sdk_type = "ets2" diff --git a/bundle.json b/bundle.json index 678960db85c2d8c173a9f87cd56122fdd221766e..1ff87abd269deaf7e7ae0b56bbe5e8e28c277818 100644 --- a/bundle.json +++ b/bundle.json @@ -40,6 +40,36 @@ }, { "name": "//interface/sdk-js:ohos_ets_kits" + }, + { + "name": "//interface/sdk-js:ets_component" + }, + { + "name": "//interface/sdk-js:ohos_declaration_ets" + }, + { + "name": "//interface/sdk-js:bundle_kits" + }, + { + "name": "//interface/sdk-js:bundle_arkts" + }, + { + "name": "//interface/sdk-js:ets_internal_api" + }, + { + "name": "//interface/sdk-js:ohos_declaration_ets_etc" + }, + { + "name": "//interface/sdk-js:ets_component_etc" + }, + { + "name": "//interface/sdk-js:bundle_kits_etc" + }, + { + "name": "//interface/sdk-js:bundle_arkts_etc" + }, + { + "name": "//interface/sdk-js:ets_internal_api_etc" } ], "test": [] diff --git a/interface_config.gni b/interface_config.gni index ecd433d2e9c9083b5e181560c90c8390ddcb4101..b0ff29d062ba8a0cabf05fc19040a656fbe72258 100644 --- a/interface_config.gni +++ b/interface_config.gni @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//build/ohos/interface/interface.gni") common_api_src = [ "//interface/sdk-js/api/@system.app.d.ts", "//interface/sdk-js/api/@system.configuration.d.ts", @@ -25,4 +26,4 @@ common_api_src_ets2 = [ "//interface/sdk-js/api/@system.mediaquery.d.ts", "//interface/sdk-js/api/@system.prompt.d.ts", ] -sdk_type = "ets" +