From a1282082ea9e10dbfa9958834a881645ed0e9ddf Mon Sep 17 00:00:00 2001 From: y00314596 Date: Mon, 21 Mar 2022 14:47:34 +0800 Subject: [PATCH] add by yangqing3@huawei.com Signed-off-by: y00314596 --- customization/BUILD.gn | 5 ++++- {global => customization}/cust/custjs/BUILD.gn | 0 {global => customization}/cust/custjs/Test.json | 0 .../cust/custjs/signature/openharmony_sx.p7b | Bin .../cust/custjs/src/main/config.json | 0 .../cust/custjs/src/main/js/default/app.js | 0 .../cust/custjs/src/main/js/default/i18n/en-US.json | 0 .../cust/custjs/src/main/js/default/i18n/zh-CN.json | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../custjs/src/main/js/default/pages/index/index.js | 0 .../custjs/src/main/js/default/test/Cust.test.js | 0 .../custjs/src/main/js/default/test/List.test.js | 0 .../src/main/resources/base/element/string.json | 0 .../custjs/src/main/resources/base/media/icon.png | Bin global/BUILD.gn | 1 - 16 files changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 customization/BUILD.gn rename {global => customization}/cust/custjs/BUILD.gn (100%) rename {global => customization}/cust/custjs/Test.json (100%) rename {global => customization}/cust/custjs/signature/openharmony_sx.p7b (100%) rename {global => customization}/cust/custjs/src/main/config.json (100%) rename {global => customization}/cust/custjs/src/main/js/default/app.js (100%) rename {global => customization}/cust/custjs/src/main/js/default/i18n/en-US.json (100%) rename {global => customization}/cust/custjs/src/main/js/default/i18n/zh-CN.json (100%) rename {global => customization}/cust/custjs/src/main/js/default/pages/index/index.css (100%) rename {global => customization}/cust/custjs/src/main/js/default/pages/index/index.hml (100%) rename {global => customization}/cust/custjs/src/main/js/default/pages/index/index.js (100%) rename {global => customization}/cust/custjs/src/main/js/default/test/Cust.test.js (100%) rename {global => customization}/cust/custjs/src/main/js/default/test/List.test.js (100%) rename {global => customization}/cust/custjs/src/main/resources/base/element/string.json (100%) rename {global => customization}/cust/custjs/src/main/resources/base/media/icon.png (100%) diff --git a/customization/BUILD.gn b/customization/BUILD.gn old mode 100644 new mode 100755 index b22d77452..ac9b94ea5 --- a/customization/BUILD.gn +++ b/customization/BUILD.gn @@ -16,6 +16,9 @@ import("//build/ohos_var.gni") group("customization") { testonly = true if (is_standard_system) { - deps = [ "enterprise_device_management:edm_test_grop" ] + deps = [ + "cust/custjs:custjs_test", + "enterprise_device_management:edm_test_grop", + ] } } diff --git a/global/cust/custjs/BUILD.gn b/customization/cust/custjs/BUILD.gn similarity index 100% rename from global/cust/custjs/BUILD.gn rename to customization/cust/custjs/BUILD.gn diff --git a/global/cust/custjs/Test.json b/customization/cust/custjs/Test.json similarity index 100% rename from global/cust/custjs/Test.json rename to customization/cust/custjs/Test.json diff --git a/global/cust/custjs/signature/openharmony_sx.p7b b/customization/cust/custjs/signature/openharmony_sx.p7b similarity index 100% rename from global/cust/custjs/signature/openharmony_sx.p7b rename to customization/cust/custjs/signature/openharmony_sx.p7b diff --git a/global/cust/custjs/src/main/config.json b/customization/cust/custjs/src/main/config.json similarity index 100% rename from global/cust/custjs/src/main/config.json rename to customization/cust/custjs/src/main/config.json diff --git a/global/cust/custjs/src/main/js/default/app.js b/customization/cust/custjs/src/main/js/default/app.js similarity index 100% rename from global/cust/custjs/src/main/js/default/app.js rename to customization/cust/custjs/src/main/js/default/app.js diff --git a/global/cust/custjs/src/main/js/default/i18n/en-US.json b/customization/cust/custjs/src/main/js/default/i18n/en-US.json similarity index 100% rename from global/cust/custjs/src/main/js/default/i18n/en-US.json rename to customization/cust/custjs/src/main/js/default/i18n/en-US.json diff --git a/global/cust/custjs/src/main/js/default/i18n/zh-CN.json b/customization/cust/custjs/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from global/cust/custjs/src/main/js/default/i18n/zh-CN.json rename to customization/cust/custjs/src/main/js/default/i18n/zh-CN.json diff --git a/global/cust/custjs/src/main/js/default/pages/index/index.css b/customization/cust/custjs/src/main/js/default/pages/index/index.css similarity index 100% rename from global/cust/custjs/src/main/js/default/pages/index/index.css rename to customization/cust/custjs/src/main/js/default/pages/index/index.css diff --git a/global/cust/custjs/src/main/js/default/pages/index/index.hml b/customization/cust/custjs/src/main/js/default/pages/index/index.hml similarity index 100% rename from global/cust/custjs/src/main/js/default/pages/index/index.hml rename to customization/cust/custjs/src/main/js/default/pages/index/index.hml diff --git a/global/cust/custjs/src/main/js/default/pages/index/index.js b/customization/cust/custjs/src/main/js/default/pages/index/index.js similarity index 100% rename from global/cust/custjs/src/main/js/default/pages/index/index.js rename to customization/cust/custjs/src/main/js/default/pages/index/index.js diff --git a/global/cust/custjs/src/main/js/default/test/Cust.test.js b/customization/cust/custjs/src/main/js/default/test/Cust.test.js similarity index 100% rename from global/cust/custjs/src/main/js/default/test/Cust.test.js rename to customization/cust/custjs/src/main/js/default/test/Cust.test.js diff --git a/global/cust/custjs/src/main/js/default/test/List.test.js b/customization/cust/custjs/src/main/js/default/test/List.test.js similarity index 100% rename from global/cust/custjs/src/main/js/default/test/List.test.js rename to customization/cust/custjs/src/main/js/default/test/List.test.js diff --git a/global/cust/custjs/src/main/resources/base/element/string.json b/customization/cust/custjs/src/main/resources/base/element/string.json similarity index 100% rename from global/cust/custjs/src/main/resources/base/element/string.json rename to customization/cust/custjs/src/main/resources/base/element/string.json diff --git a/global/cust/custjs/src/main/resources/base/media/icon.png b/customization/cust/custjs/src/main/resources/base/media/icon.png similarity index 100% rename from global/cust/custjs/src/main/resources/base/media/icon.png rename to customization/cust/custjs/src/main/resources/base/media/icon.png diff --git a/global/BUILD.gn b/global/BUILD.gn index 7f1b9096f..7b809f5a5 100755 --- a/global/BUILD.gn +++ b/global/BUILD.gn @@ -17,7 +17,6 @@ group("global") { testonly = true if (is_standard_system) { deps = [ - "cust/custjs:custjs_test", "i18n_standard/intljs:intljs_test", "perf/perfjs:perfjs_test", "resmgr_standard/resmgrjs:resmgrjs_test", -- GitLab