Merge branch 'commonlibrary_wangyy' of https://gitee.com/hu0475/xts_acts into commonlibrary_wangyy

commonlibrary/crossplatform/BUILD.gn

@@ -16,15 +16,15 @@ group("crossplatform") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "commonlibraryutiletstest:util_ets_test",
-      "commonlibraryurletstest:url_ets_test",
       "commonlibraryconvertxmletstest:convertxml_ets_test",
-      "commonlibraryurietstest:uri_ets_test",
       "commonlibrarydequeetstest:deque_ets_test",
       "commonlibraryhashmapetstest:hashmap_ets_test",
       "commonlibraryhashsetetstest:hashset_ets_test",
-      "commonlibrarytreesetetstest:treeset_ets_test",
       "commonlibraryplainarrayetstest:plainarray_ets_test",
+      "commonlibrarytreesetetstest:treeset_ets_test",
+      "commonlibraryurietstest:uri_ets_test",
+      "commonlibraryurletstest:url_ets_test",
+      "commonlibraryutiletstest:util_ets_test",
     ]
   }
 }

commonlibrary/crossplatform/commonlibraryconvertxmletstest/BUILD.gn

@@ -20,6 +20,7 @@ ohos_js_hap_suite("convertxml_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "convertxml_ets_test"
   subsystem_name = "commonlibrary"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("convertxml_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}

commonlibrary/crossplatform/commonlibrarydequeetstest/BUILD.gn

@@ -20,6 +20,7 @@ ohos_js_hap_suite("deque_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "deque_ets_test"
   subsystem_name = "commonlibrary"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("deque_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}

commonlibrary/crossplatform/commonlibraryhashmapetstest/BUILD.gn

@@ -20,6 +20,7 @@ ohos_js_hap_suite("hashmap_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "hashmap_ets_test"
   subsystem_name = "commonlibrary"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("hashmap_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}

commonlibrary/crossplatform/commonlibraryhashsetetstest/BUILD.gn

@@ -20,6 +20,7 @@ ohos_js_hap_suite("hashset_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "hashset_ets_test"
   subsystem_name = "commonlibrary"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("hashset_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}

commonlibrary/crossplatform/commonlibraryplainarrayetstest/BUILD.gn

@@ -20,6 +20,7 @@ ohos_js_hap_suite("plainarray_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "plainarray_ets_test"
   subsystem_name = "commonlibrary"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("plainarray_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}

commonlibrary/crossplatform/commonlibrarytreesetetstest/BUILD.gn

@@ -20,6 +20,7 @@ ohos_js_hap_suite("treeset_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "treeset_ets_test"
   subsystem_name = "commonlibrary"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("treeset_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}

commonlibrary/crossplatform/commonlibraryurietstest/BUILD.gn

@@ -20,6 +20,7 @@ ohos_js_hap_suite("uri_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "uri_ets_test"
   subsystem_name = "commonlibrary"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("uri_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}

commonlibrary/crossplatform/commonlibraryurletstest/BUILD.gn

@@ -20,6 +20,7 @@ ohos_js_hap_suite("url_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "url_ets_test"
   subsystem_name = "commonlibrary"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("url_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}

commonlibrary/crossplatform/commonlibraryutiletstest/BUILD.gn

@@ -20,6 +20,7 @@ ohos_js_hap_suite("util_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "util_ets_test"
   subsystem_name = "commonlibrary"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("util_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}