diff --git a/graphic/BUILD.gn b/graphic/BUILD.gn
index a7dccb27a723bb3aa8f15edccbb3a813def00faf..df3180a9a94c1e0b2981e6dfa65b52ce57916fc4 100755
--- a/graphic/BUILD.gn
+++ b/graphic/BUILD.gn
@@ -16,6 +16,7 @@ group("graphic") {
testonly = true
if (is_standard_system) {
deps = [
+ "crossplatform:crossplatform",
"effectKit:EffectKitTest",
"graphicColorSpace:ActsColorSpaceManagerTest",
"graphicnapidrawingtest:ActsGraphicNapiDrawingTest",
@@ -23,7 +24,6 @@ group("graphic") {
"webGL:webGL_hap_test",
"windowStage:ActsWindowStageTest",
"windowstandard:window_hap_test",
- "crossplatform:crossplatform",
]
if (!(product_name == "ohcore")) {
deps += [ "vkgl:cpvkgl" ]
diff --git a/graphic/crossplatform/.idea/.gitignore b/graphic/crossplatform/.idea/.gitignore
deleted file mode 100644
index 26d33521af10bcc7fd8cea344038eaaeb78d0ef5..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/graphic/crossplatform/.idea/crossplatform.iml b/graphic/crossplatform/.idea/crossplatform.iml
deleted file mode 100644
index d6ebd4805981b8400db3e3291c74a743fef9a824..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/crossplatform.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml
deleted file mode 100644
index 34c36371abe13dc2b25a6aa3c5c74d899ad041d6..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml
deleted file mode 100644
index 53ec233c81c5300deb492843e530bed587dba50c..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml
deleted file mode 100644
index d2e0262f123b40345331449308d75d9d3abce9a9..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml
deleted file mode 100644
index 155627ed49c9f977a6f86137e6b309b37bf562ef..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml
deleted file mode 100644
index 5e619b0ef7b23a5f84f9bfd9232e83d77b541879..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml
deleted file mode 100644
index 7de8c0eb026b14103cc0db6f9b8946635debed50..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/misc.xml b/graphic/crossplatform/.idea/misc.xml
deleted file mode 100644
index 639900d13c6182e452e33a3bd638e70a0146c785..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/modules.xml b/graphic/crossplatform/.idea/modules.xml
deleted file mode 100644
index cdb75f80a292a93d6e125b848a81374f201f525d..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/vcs.xml b/graphic/crossplatform/.idea/vcs.xml
deleted file mode 100644
index b2bdec2d71b6a5ce4ae49efc37516809c50e4d5e..0000000000000000000000000000000000000000
--- a/graphic/crossplatform/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/graphic/crossplatform/BUILD.gn b/graphic/crossplatform/BUILD.gn
index 3a0a35187fff59ec83c67524a30d305c5849d67c..e411c1841a08d265ec0d8c88c1a9d04c05b828d6 100644
--- a/graphic/crossplatform/BUILD.gn
+++ b/graphic/crossplatform/BUILD.gn
@@ -15,8 +15,6 @@ import("//test/xts/tools/build/suite.gni")
group("crossplatform") {
testonly = true
if (is_standard_system) {
- deps = [
- "graphicDisplayetstest:Display_ets_test",
- ]
+ deps = [ "graphicDisplayetstest:ActsCrossPlatformDisplayTest" ]
}
}
diff --git a/graphic/crossplatform/graphicDisplayetstest/BUILD.gn b/graphic/crossplatform/graphicDisplayetstest/BUILD.gn
index b382d3740cc7a027a497e472bc06073a52b0ffd4..098433b3d67416921010685104e9d88fc56a8797 100644
--- a/graphic/crossplatform/graphicDisplayetstest/BUILD.gn
+++ b/graphic/crossplatform/graphicDisplayetstest/BUILD.gn
@@ -20,6 +20,7 @@ ohos_js_hap_suite("ActsCrossPlatformDisplayTest") {
]
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
+
# hap_name: HAP的名字,可选,默认为目标名
hap_name = "ActsCrossPlatformDisplayTest"
subsystem_name = "window"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("ActsCrossPlatformDisplayTest") {
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
+}