From 7435237b94bcf8ee676ba7bc2aff4edf770d5034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miss=E6=B7=B1=E6=B5=B7=E9=B1=BC?= Date: Wed, 19 Jan 2022 06:43:21 +0000 Subject: [PATCH 1/6] update time.gni. Signed-off-by:liulinna --- time.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time.gni b/time.gni index c20574fc..df2dde85 100755 --- a/time.gni +++ b/time.gni @@ -14,7 +14,7 @@ import("//build/ohos.gni") time_root_path = "//base/miscservices/time" -kits_path = "${time_root_path}/interface/kits" +kits_path = "${time_root_path}/interfaces/kits" innerkits_path = "${time_root_path}/interfaces/innerkits" -- Gitee From a9d020668de608297214879f636e2d9476eccdb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miss=E6=B7=B1=E6=B5=B7=E9=B1=BC?= Date: Wed, 19 Jan 2022 06:44:48 +0000 Subject: [PATCH 2/6] update ohos.build. Signed-off-by:liulinna --- ohos.build | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/ohos.build b/ohos.build index f96f7921..e69de29b 100755 --- a/ohos.build +++ b/ohos.build @@ -1,18 +0,0 @@ -{ - "subsystem": "miscservices", - "parts": { - "time_native": { - "variants": [ - "phone", - "wearable", - "ivi" - ], - "module_list": [ - "//base/miscservices/time:time_native_packages" - ], - "test_list": [ - "//base/miscservices/time/services/time_manager/test:TimeServiceTest" - ] - } - } -} -- Gitee From 7febee191178f8d57ea2e630830166e57aa945ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miss=E6=B7=B1=E6=B5=B7=E9=B1=BC?= Date: Wed, 19 Jan 2022 06:53:38 +0000 Subject: [PATCH 3/6] add bundle.json. Signed-off-by:liulinna --- bundle.json | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 bundle.json diff --git a/bundle.json b/bundle.json new file mode 100644 index 00000000..1cc60941 --- /dev/null +++ b/bundle.json @@ -0,0 +1,67 @@ +{ + "name": "@ohos/time", + "description": "Allowing apps to use OS time get/set functions", + "version": "3.1", + "license": "Apache License 2.0", + "publishAs": "code-segment", + "segment": { + "destPath": "base/miscservices/time" + }, + "dirs": {}, + "scripts": {}, + "component": { + "name": "time_native", + "subsystem": "miscservices", + "syscap": [ + "SystemCapability.Miscservices.Time" + ], + "features": [ + ], + "adapted_system_type": [ + "standard" + ], + "rom":"300KB", + "ram":"1024KB", + "deps": { + "components": [ + "ability_manager", + "aafwk_standard", + "appexecfwk_standard", + "ans_standard", + "ces_standard", + "distributeddatamgr", + "hisysevent_native", + "hiviewdfx_hilog_native", + "ipc", + "permission_standard", + "safwk", + "samgr_standard", + "startup_l2", + "utils_base" + ], + "third_party": [ + "jsoncpp" + ] + }, + "build": { + "sub_component": [ + "//base/miscservices/time:time_native_packages" + ], + "inner_kits": [ + { + "name": "//base/miscservices/time/services:time_service", + "header": { + "header_files": [ + "itimer_info.h", + "time_service_client.h" + ], + "header_base":"//base/miscservices/time/interfaces/innerkits/include" + } + } + ], + "test": [ + "//base/miscservices/time/services/time_manager/test:TimeServiceTest" + ] + } + } +} \ No newline at end of file -- Gitee From e77e9396aa3562ca1bb2de026d4144866716952c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miss=E6=B7=B1=E6=B5=B7=E9=B1=BC?= Date: Wed, 19 Jan 2022 06:54:51 +0000 Subject: [PATCH 4/6] update time.gni. Signed-off-by:liulinna --- time.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time.gni b/time.gni index df2dde85..c1371be1 100755 --- a/time.gni +++ b/time.gni @@ -20,4 +20,4 @@ innerkits_path = "${time_root_path}/interfaces/innerkits" time_utils_path = "${time_root_path}/utils" -adapter_path = "${time_root_path}/adapter" \ No newline at end of file +adapter_path = "${time_root_path}/adapter" -- Gitee From 32e6a42b4310b0241625fba1c1f8491674d855b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miss=E6=B7=B1=E6=B5=B7=E9=B1=BC?= Date: Wed, 19 Jan 2022 06:55:09 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20ohos?= =?UTF-8?q?.build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ohos.build | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 ohos.build diff --git a/ohos.build b/ohos.build deleted file mode 100755 index e69de29b..00000000 -- Gitee From cdad5f447335cebed716d884fa690624e24ce949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miss=E6=B7=B1=E6=B5=B7=E9=B1=BC?= Date: Wed, 19 Jan 2022 07:21:43 +0000 Subject: [PATCH 6/6] update bundle.json. Signed-off-by:liulinna --- bundle.json | 126 ++++++++++++++++++++++++++-------------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/bundle.json b/bundle.json index 1cc60941..5c63f31f 100644 --- a/bundle.json +++ b/bundle.json @@ -1,67 +1,67 @@ { - "name": "@ohos/time", - "description": "Allowing apps to use OS time get/set functions", - "version": "3.1", - "license": "Apache License 2.0", - "publishAs": "code-segment", - "segment": { - "destPath": "base/miscservices/time" + "name": "@ohos/time", + "description": "Allowing apps to use OS time get/set functions", + "version": "3.1", + "license": "Apache License 2.0", + "publishAs": "code-segment", + "segment": { + "destPath": "base/miscservices/time" + }, + "dirs": {}, + "scripts": {}, + "component": { + "name": "time_native", + "subsystem": "miscservices", + "syscap": [ + "SystemCapability.Miscservices.Time" + ], + "features": [ + ], + "adapted_system_type": [ + "standard" + ], + "rom":"300KB", + "ram":"1024KB", + "deps": { + "components": [ + "ability_manager", + "aafwk_standard", + "appexecfwk_standard", + "ans_standard", + "ces_standard", + "distributeddatamgr", + "hisysevent_native", + "hiviewdfx_hilog_native", + "ipc", + "permission_standard", + "safwk", + "samgr_standard", + "startup_l2", + "utils_base" + ], + "third_party": [ + "jsoncpp" + ] }, - "dirs": {}, - "scripts": {}, - "component": { - "name": "time_native", - "subsystem": "miscservices", - "syscap": [ - "SystemCapability.Miscservices.Time" - ], - "features": [ - ], - "adapted_system_type": [ - "standard" - ], - "rom":"300KB", - "ram":"1024KB", - "deps": { - "components": [ - "ability_manager", - "aafwk_standard", - "appexecfwk_standard", - "ans_standard", - "ces_standard", - "distributeddatamgr", - "hisysevent_native", - "hiviewdfx_hilog_native", - "ipc", - "permission_standard", - "safwk", - "samgr_standard", - "startup_l2", - "utils_base" - ], - "third_party": [ - "jsoncpp" - ] - }, - "build": { - "sub_component": [ - "//base/miscservices/time:time_native_packages" - ], - "inner_kits": [ - { - "name": "//base/miscservices/time/services:time_service", - "header": { - "header_files": [ - "itimer_info.h", - "time_service_client.h" - ], - "header_base":"//base/miscservices/time/interfaces/innerkits/include" - } - } - ], - "test": [ - "//base/miscservices/time/services/time_manager/test:TimeServiceTest" - ] - } + "build": { + "sub_component": [ + "//base/miscservices/time:time_native_packages" + ], + "inner_kits": [ + { + "name": "//base/miscservices/time/services:time_service", + "header": { + "header_files": [ + "itimer_info.h", + "time_service_client.h" + ], + "header_base":"//base/miscservices/time/interfaces/innerkits/include" + } + } + ], + "test": [ + "//base/miscservices/time/services/time_manager/test:TimeServiceTest" + ] } + } } \ No newline at end of file -- Gitee