From 8ae6455de682b7e482b2408bc803536de745538d Mon Sep 17 00:00:00 2001 From: chenqy930 Date: Thu, 7 Jul 2022 20:53:22 +0800 Subject: [PATCH 01/15] Switch component ark_ts2abc to arkcompiler_ets_frontend Signed-off-by: chenqy930 Change-Id: I9cf5cf78f34468216dec547ea0bfe60c45e33247 --- interfaces/kits/napi/file_access_ext_ability/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/napi/file_access_ext_ability/BUILD.gn b/interfaces/kits/napi/file_access_ext_ability/BUILD.gn index c7879905..c049a4c5 100644 --- a/interfaces/kits/napi/file_access_ext_ability/BUILD.gn +++ b/interfaces/kits/napi/file_access_ext_ability/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//ark/ts2abc/ts2panda/ts2abc_config.gni") +import("//arkcompiler/ets_frontend/ts2panda/ts2abc_config.gni") import("//build/ohos.gni") ts2abc_gen_abc("gen_file_access_ext_ability_abc") { -- Gitee From 625f72a2c007a02f768047a888e13d9fc501976f Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Tue, 12 Jul 2022 10:44:10 +0800 Subject: [PATCH 02/15] alter connectAbility from async to sync Signed-off-by: linjun9528 --- .../file_access/include/file_access_ext_connection.h | 12 ++++++------ .../file_access/src/file_access_ext_connection.cpp | 11 ++++++++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_ext_connection.h b/frameworks/innerkits/file_access/include/file_access_ext_connection.h index e47b0cff..ad22f080 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_connection.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_connection.h @@ -31,21 +31,21 @@ public: virtual ~FileAccessExtConnection() = default; static sptr GetInstance(); - void OnAbilityConnectDone( const AppExecFwk::ElementName &element, const sptr &remoteObject, int resultCode) override; - void OnAbilityDisconnectDone(const AppExecFwk::ElementName &element, int resultCode) override; - void ConnectFileExtAbility(const AAFwk::Want &want, const sptr &token); - void DisconnectFileExtAbility(); - bool IsExtAbilityConnected(); - sptr GetFileExtProxy(); private: + struct ConnectCondition { + std::condition_variable condition; + std::mutex mutex; + }; + ConnectCondition condition_; + static sptr instance_; static std::mutex mutex_; std::atomic isConnected_ = {false}; diff --git a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp index e7e96042..2570451e 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp @@ -21,6 +21,9 @@ namespace OHOS { namespace FileAccessFwk { +namespace { + constexpr int WAIT_TIME = 1; +} sptr FileAccessExtConnection::instance_ = nullptr; std::mutex FileAccessExtConnection::mutex_; @@ -43,6 +46,8 @@ void FileAccessExtConnection::OnAbilityConnectDone( return; } fileExtProxy_ = iface_cast(remoteObject); + std::unique_lock lock(condition_.mutex); + condition_.condition.notify_all(); if (fileExtProxy_ == nullptr) { HILOG_ERROR("%{public}s failed, fileExtProxy_ is nullptr", __func__); return; @@ -58,8 +63,12 @@ void FileAccessExtConnection::OnAbilityDisconnectDone(const AppExecFwk::ElementN void FileAccessExtConnection::ConnectFileExtAbility(const AAFwk::Want &want, const sptr &token) { + std::unique_lock lock(condition_.mutex); ErrCode ret = AAFwk::AbilityManagerClient::GetInstance()->ConnectAbility(want, this, token); - HILOG_INFO("%{public}s called end, ret=%{public}d", __func__, ret); + if (condition_.condition.wait_for(lock, std::chrono::seconds(WAIT_TIME), + [this] { return fileExtProxy_ != nullptr; })) { + } + HILOG_INFO("ConnectAbility ret = %{public}d", ret); } void FileAccessExtConnection::DisconnectFileExtAbility() -- Gitee From e4db3eee3b7ce8643341ce9e29f8e8df5ecf7758 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Tue, 12 Jul 2022 10:47:18 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=B0=86hap=E5=8C=85APL=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E9=99=8D=E4=B8=BA=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../FileExtensionAbility.ts | 4 ++-- .../entry/src/main/module.json | 3 --- services/signature/fileextension.p7b | Bin 3443 -> 3536 bytes 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 756e587c..cc1f3497 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -17,8 +17,8 @@ import fileio from '@ohos.fileio' import { init, delVolumeInfo, getVolumeInfoList } from './VolumeManager' import { onReceiveEvent } from './Subcriber' import fileExtensionInfo from "@ohos.fileExtensionInfo" -import appManager from '@ohos.application.appManager'; import hilog from '@ohos.hilog' +import process from '@ohos.process'; const FLAG = fileExtensionInfo.FLAG; const BUNDLE_NAME = 'com.ohos.UserFile.ExternalFileManager'; @@ -33,7 +33,7 @@ export default class FileExtAbility extends Extension { init(); onReceiveEvent(function (data) { if (data.event == 'usual.event.data.VOLUME_MOUNTED') { - appManager.killProcessesByBundleName(BUNDLE_NAME); + process.exit(0); } else { delVolumeInfo(data.parameters.id); } diff --git a/services/file_extension_hap/entry/src/main/module.json b/services/file_extension_hap/entry/src/main/module.json index 3908c63b..2be4db66 100644 --- a/services/file_extension_hap/entry/src/main/module.json +++ b/services/file_extension_hap/entry/src/main/module.json @@ -22,9 +22,6 @@ } ], "requestPermissions": [ - { - "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, { "name": "ohos.permission.STORAGE_MANAGER" } diff --git a/services/signature/fileextension.p7b b/services/signature/fileextension.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..ae89c44a5f8ded8ce4723cbd922a2dd5f9897727 100644 GIT binary patch delta 1050 zcmYjQO=u%!7~Z65*X~+Dt+FT!HSWo5n{OsblPUD@eUmSfG?_^!Gt*{bsymsPOw!C> z{yNF55QuCKUPObSAh;d`R}h3f3F<{}ThxR0p!bz!Jt-=CkagOHu9xrSeR#g-;eC0Z zKVSIq#R-@$9W5-ra+p8-XDM_(d~>?=bpU-C4uyy%aB*Sr+F?GV&qcx^FrBv^6GJzr z^RGpw^R?^I1HIR8JNByTXnJ&mym|)MiWLA+at*A3=+)?O*w%tJ1;})RqV&~NGkD&a zytzoF$uzZ2g7w+OP$yQ&(lk^p19}AnjRMZbaI)<~78ypj)!8p^^L!S15@Z=;_Hn4X zm1tXM z4+dNfVZ9_ux~y*1Xjd5N+kmJ*MiL5Km%#P&4el+fpYVK>*y^RcDbsnx(ZfHwX`(a&EUFSAkErVLTJE! z*y)aie1jnSfu4{{6$Oqe(kzRexGsq)O{$t|u|nE4AFx~6NKEBYL|3iWZGs+Jen*vC zhO{|*BSHeF<@DF2zTV5VO??fI271p{%#(&yY{k%f!PzRV8CxC&my)MA)=9$E59v2+dsO2ZY`H5se6~BfBf?KU-fV99Q}Jt zK6T8$#eoY8PXyupels!`jxYd+Upn{c{pFvZ^RB&j?!m96)iQiPcmIpe9!?%2p1zm) t&fU8mUTOUPQ*7@;bob7syEmTy#DDtA2bX^+eoM?fu-<)}8;Y02{{XK)T5JFS delta 1023 zcmY+D&x_+^7{{lb&a5-*_*)ONm$52{yE}c8Hao2_!uuv^lWyOp=_GAaD{h*m$+T&b zY0^oibEs4q@FFaAWl!!1f*^~cvYrGH@usqZ|G;`!FTyIj;DRog*_9D5FT5WVv#NYeLU47_nJN8-4>FCLqi8IH*RtFJC66;_cB+n#AqwP*~r2x6n&gJy8R5v;< zPTpKPm(681(j=9gos9KQ<1tOcwr;?HN6_F|RiIO224Z9wJ7&KpR78=1fedj0&pwDX zR(hCb3y_dm7-Ds{7+;%+fDJfPE8`v;;2zv-*;wL3LBe4@qGhHZ;vNoU$k zq$U)fuUbkSgy$JJcpzb^Wpm(v8pX5uKr4i1G&ylybe6UBaCb%@`sjbA$y@ zrcyAGg^kWOIqqide$I2%F)Q*Z&?pCP*UyTO54f!nBo!ck4JMf#~-qGF)WS?o|&4xmmpshT;1l>;lQ!?)>YSC_jS*Y z_E~kUXq~-1&({a9YtB%g-Az3AMSWr8#4-ZY*eg+mK!5hrvOc@_Fg+nb7Hkk?Cfx+7 z;~Fg`h-6~z9d~tod3FEk@@Det>9;PwaP!++=fu)8H$F7(xZ2&XFN5X9hoXZ1xS5!b zCpeIgKRb7`y4kt%-D_W+dX=T_{B`l?wL|^-+wWc*e12)}$zT3>?6*jHzwsIMef;nf h>E7*2pWb?6;p6kyuIxYmQS6&v-}vFn8z-(l@()6`RXP9w -- Gitee From c36afbcd818e08d092e1c6cac0812374293f3275 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Tue, 12 Jul 2022 18:03:18 +0800 Subject: [PATCH 04/15] fix codex Signed-off-by: linjun9528 --- .../include/file_access_ext_connection.h | 5 +++-- .../src/file_access_ext_connection.cpp | 16 ++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_ext_connection.h b/frameworks/innerkits/file_access/include/file_access_ext_connection.h index ad22f080..e0565b51 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_connection.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_connection.h @@ -40,11 +40,12 @@ public: sptr GetFileExtProxy(); private: - struct ConnectCondition { + struct ThreadLockInfo { std::condition_variable condition; std::mutex mutex; + bool isReady = false; }; - ConnectCondition condition_; + ThreadLockInfo connectLockInfo_; static sptr instance_; static std::mutex mutex_; diff --git a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp index 2570451e..5c8c955a 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp @@ -46,8 +46,11 @@ void FileAccessExtConnection::OnAbilityConnectDone( return; } fileExtProxy_ = iface_cast(remoteObject); - std::unique_lock lock(condition_.mutex); - condition_.condition.notify_all(); + { + std::lock_guard lock(connectLockInfo_.mutex); + connectLockInfo_.isReady = true; + connectLockInfo_.condition.notify_all(); + } if (fileExtProxy_ == nullptr) { HILOG_ERROR("%{public}s failed, fileExtProxy_ is nullptr", __func__); return; @@ -63,12 +66,13 @@ void FileAccessExtConnection::OnAbilityDisconnectDone(const AppExecFwk::ElementN void FileAccessExtConnection::ConnectFileExtAbility(const AAFwk::Want &want, const sptr &token) { - std::unique_lock lock(condition_.mutex); ErrCode ret = AAFwk::AbilityManagerClient::GetInstance()->ConnectAbility(want, this, token); - if (condition_.condition.wait_for(lock, std::chrono::seconds(WAIT_TIME), - [this] { return fileExtProxy_ != nullptr; })) { + std::unique_lock lock(connectLockInfo_.mutex); + if (!connectLockInfo_.condition.wait_for(lock, std::chrono::seconds(WAIT_TIME), + [this] { return fileExtProxy_ != nullptr && connectLockInfo_.isReady; })) { + HILOG_INFO("Wait connect timeout."); } - HILOG_INFO("ConnectAbility ret = %{public}d", ret); + HILOG_INFO("ConnectAbility ret=%{public}d", ret); } void FileAccessExtConnection::DisconnectFileExtAbility() -- Gitee From d02c98040e562e601f8dc82ea015de3747cad7e1 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Tue, 12 Jul 2022 18:59:40 +0800 Subject: [PATCH 05/15] fix codex Signed-off-by: linjun9528 --- .../innerkits/file_access/src/file_access_ext_connection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp index 5c8c955a..2dd05aff 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp @@ -69,7 +69,7 @@ void FileAccessExtConnection::ConnectFileExtAbility(const AAFwk::Want &want, con ErrCode ret = AAFwk::AbilityManagerClient::GetInstance()->ConnectAbility(want, this, token); std::unique_lock lock(connectLockInfo_.mutex); if (!connectLockInfo_.condition.wait_for(lock, std::chrono::seconds(WAIT_TIME), - [this] { return fileExtProxy_ != nullptr && connectLockInfo_.isReady; })) { + [this] { return fileExtProxy_ != nullptr && connectLockInfo_.isReady; })) { HILOG_INFO("Wait connect timeout."); } HILOG_INFO("ConnectAbility ret=%{public}d", ret); -- Gitee From 611da28a55b4efdf8270175c0eb7672784707bc3 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Tue, 12 Jul 2022 20:20:30 +0800 Subject: [PATCH 06/15] fix codex Signed-off-by: linjun9528 --- .../src/file_access_ext_connection.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp index 2dd05aff..561d7dd8 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp @@ -42,20 +42,18 @@ void FileAccessExtConnection::OnAbilityConnectDone( const AppExecFwk::ElementName &element, const sptr &remoteObject, int resultCode) { if (remoteObject == nullptr) { - HILOG_ERROR("%{public}s failed, remote is nullptr", __func__); + HILOG_ERROR("remote is nullptr"); return; } fileExtProxy_ = iface_cast(remoteObject); - { - std::lock_guard lock(connectLockInfo_.mutex); - connectLockInfo_.isReady = true; - connectLockInfo_.condition.notify_all(); - } if (fileExtProxy_ == nullptr) { - HILOG_ERROR("%{public}s failed, fileExtProxy_ is nullptr", __func__); + HILOG_ERROR("fileExtProxy_ is nullptr"); return; } isConnected_.store(true); + std::lock_guard lock(connectLockInfo_.mutex); + connectLockInfo_.isReady = true; + connectLockInfo_.condition.notify_all(); } void FileAccessExtConnection::OnAbilityDisconnectDone(const AppExecFwk::ElementName &element, int resultCode) @@ -67,12 +65,15 @@ void FileAccessExtConnection::OnAbilityDisconnectDone(const AppExecFwk::ElementN void FileAccessExtConnection::ConnectFileExtAbility(const AAFwk::Want &want, const sptr &token) { ErrCode ret = AAFwk::AbilityManagerClient::GetInstance()->ConnectAbility(want, this, token); + if (ret != ERR_OK) { + HILOG_INFO("ConnectAbility ret=%{public}d", ret); + return; + } std::unique_lock lock(connectLockInfo_.mutex); if (!connectLockInfo_.condition.wait_for(lock, std::chrono::seconds(WAIT_TIME), [this] { return fileExtProxy_ != nullptr && connectLockInfo_.isReady; })) { HILOG_INFO("Wait connect timeout."); } - HILOG_INFO("ConnectAbility ret=%{public}d", ret); } void FileAccessExtConnection::DisconnectFileExtAbility() -- Gitee From f1659bda260ec4865c790178c50e7a74685ad610 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Wed, 13 Jul 2022 11:36:48 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_access/include/ifile_access_ext_base.h | 14 +++++++------- .../file_access/src/file_access_helper.cpp | 8 ++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h index 5c79a87b..fdc837b8 100644 --- a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h @@ -32,13 +32,13 @@ public: enum { CMD_OPEN_FILE = 1, - CMD_CREATE_FILE = 2, - CMD_MKDIR = 3, - CMD_DELETE = 4, - CMD_MOVE = 5, - CMD_RENAME = 6, - CMD_LIST_FILE = 7, - CMD_GET_ROOTS = 8 + CMD_CREATE_FILE, + CMD_MKDIR, + CMD_DELETE, + CMD_MOVE, + CMD_RENAME, + CMD_LIST_FILE, + CMD_GET_ROOTS }; virtual int OpenFile(const Uri &uri, int flags) = 0; diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 39dd4886..97545ce0 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -114,6 +114,10 @@ std::shared_ptr FileAccessHelper::Creator( bool FileAccessHelper::Release() { + if (fileAccessExtConnection_ == nullptr) { + return false; + } + if (fileAccessExtConnection_->IsExtAbilityConnected()) { fileAccessExtConnection_->DisconnectFileExtAbility(); } @@ -123,6 +127,10 @@ bool FileAccessHelper::Release() bool FileAccessHelper::GetProxy() { + if (fileAccessExtConnection_ == nullptr) { + return false; + } + if (!fileAccessExtConnection_->IsExtAbilityConnected()) { fileAccessExtConnection_->ConnectFileExtAbility(want_, token_); } -- Gitee From a64ec2c135935877ddaeb0e746f2cf36f4d3f64f Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Wed, 13 Jul 2022 15:07:42 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_access/src/file_access_helper.cpp | 7 ++++++- .../file_access/src/napi_common_fileaccess.cpp | 16 ---------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 97545ce0..f29a7696 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -63,6 +63,11 @@ FileAccessHelper::FileAccessHelper(const sptr &token, std::shared_ptr FileAccessHelper::Creator(const sptr &token, const AAFwk::Want &want) { + if (token == nullptr) { + HILOG_ERROR("failed, token == nullptr"); + return nullptr; + } + sptr fileAccessExtProxy = nullptr; sptr fileAccessExtConnection = FileAccessExtConnection::GetInstance(); @@ -130,7 +135,7 @@ bool FileAccessHelper::GetProxy() if (fileAccessExtConnection_ == nullptr) { return false; } - + if (!fileAccessExtConnection_->IsExtAbilityConnected()) { fileAccessExtConnection_->ConnectFileExtAbility(want_, token_); } diff --git a/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp b/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp index b8a02f7b..7f0075c3 100644 --- a/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp +++ b/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp @@ -112,27 +112,21 @@ napi_value WrapFileInfo(napi_env env, const FileInfo &fileInfo) NAPI_CALL(env, napi_create_object(env, &jsObject)); - jsValue = nullptr; jsValue = OHOS::AppExecFwk::WrapStringToJS(env, fileInfo.uri.ToString()); SetPropertyValueByPropertyName(env, jsObject, "uri", jsValue); - jsValue = nullptr; jsValue = OHOS::AppExecFwk::WrapStringToJS(env, fileInfo.fileName); SetPropertyValueByPropertyName(env, jsObject, "fileName", jsValue); - jsValue = nullptr; jsValue = OHOS::AppExecFwk::WrapStringToJS(env, fileInfo.mode); SetPropertyValueByPropertyName(env, jsObject, "mode", jsValue); - jsValue = nullptr; jsValue = OHOS::AppExecFwk::WrapInt64ToJS(env, fileInfo.size); SetPropertyValueByPropertyName(env, jsObject, "size", jsValue); - jsValue = nullptr; jsValue = OHOS::AppExecFwk::WrapInt64ToJS(env, fileInfo.mtime); SetPropertyValueByPropertyName(env, jsObject, "mtime", jsValue); - jsValue = nullptr; jsValue = OHOS::AppExecFwk::WrapStringToJS(env, fileInfo.mimeType); SetPropertyValueByPropertyName(env, jsObject, "mimeType", jsValue); @@ -150,12 +144,10 @@ bool UnwrapFileInfo(napi_env env, napi_value param, FileInfo &fileInfo) fileInfo.uri = Uri(natValueString); } - natValueString = ""; if (OHOS::AppExecFwk::UnwrapStringByPropertyName(env, param, "fileName", natValueString)) { fileInfo.fileName = natValueString; } - natValueString = ""; if (OHOS::AppExecFwk::UnwrapStringByPropertyName(env, param, "mode", natValueString)) { fileInfo.mode = natValueString; } @@ -165,12 +157,10 @@ bool UnwrapFileInfo(napi_env env, napi_value param, FileInfo &fileInfo) fileInfo.size = natValueInt64; } - natValueInt64 = ERR_OK; if (UnwrapInt64ByPropertyName(env, param, "mtime", natValueInt64)) { fileInfo.mtime = natValueInt64; } - natValueString = ""; if (OHOS::AppExecFwk::UnwrapStringByPropertyName(env, param, "mimeType", natValueString)) { fileInfo.mimeType = natValueString; } @@ -226,19 +216,15 @@ napi_value WrapDeviceInfo(napi_env env, const DeviceInfo &deviceInfo) NAPI_CALL(env, napi_create_object(env, &jsObject)); - jsValue = nullptr; jsValue = OHOS::AppExecFwk::WrapStringToJS(env, deviceInfo.uri.ToString()); SetPropertyValueByPropertyName(env, jsObject, "uri", jsValue); - jsValue = nullptr; jsValue = OHOS::AppExecFwk::WrapStringToJS(env, deviceInfo.displayName); SetPropertyValueByPropertyName(env, jsObject, "displayName", jsValue); - jsValue = nullptr; jsValue = OHOS::AppExecFwk::WrapStringToJS(env, deviceInfo.deviceId); SetPropertyValueByPropertyName(env, jsObject, "deviceId", jsValue); - jsValue = nullptr; jsValue = WrapUint32ToJS(env, deviceInfo.flags); SetPropertyValueByPropertyName(env, jsObject, "flags", jsValue); @@ -256,12 +242,10 @@ bool UnwrapDeviceInfo(napi_env env, napi_value param, DeviceInfo &deviceInfo) deviceInfo.uri = Uri(natValueString); } - natValueString = ""; if (OHOS::AppExecFwk::UnwrapStringByPropertyName(env, param, "displayName", natValueString)) { deviceInfo.displayName = natValueString; } - natValueString = ""; if (OHOS::AppExecFwk::UnwrapStringByPropertyName(env, param, "deviceId", natValueString)) { deviceInfo.deviceId = natValueString; } -- Gitee From 3c6bdb5b230bd997261b14bc3adb74a98a825425 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Wed, 13 Jul 2022 15:34:48 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index f29a7696..9a3a497a 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -64,7 +64,7 @@ FileAccessHelper::FileAccessHelper(const sptr &token, std::shared_ptr FileAccessHelper::Creator(const sptr &token, const AAFwk::Want &want) { if (token == nullptr) { - HILOG_ERROR("failed, token == nullptr"); + HILOG_ERROR("FileAccessHelper::Creator failed, token is nullptr"); return nullptr; } @@ -93,7 +93,7 @@ std::shared_ptr FileAccessHelper::Creator( const std::shared_ptr &context, const AAFwk::Want &want) { if (context == nullptr) { - HILOG_ERROR("failed, context == nullptr"); + HILOG_ERROR("FileAccessHelper::Creator failed, context is nullptr"); return nullptr; } -- Gitee From e47280609404f6319435f4d270949851610092d3 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Thu, 14 Jul 2022 12:47:48 +0800 Subject: [PATCH 10/15] add comment Signed-off-by: linjun9528 --- .../innerkits/file_access/src/file_access_ext_connection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp index 561d7dd8..a07a3fb7 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp @@ -22,7 +22,7 @@ namespace OHOS { namespace FileAccessFwk { namespace { - constexpr int WAIT_TIME = 1; + constexpr int WAIT_TIME = 1; // second } sptr FileAccessExtConnection::instance_ = nullptr; std::mutex FileAccessExtConnection::mutex_; -- Gitee From d98353cc65cbbb96e44223ca0c480f873f60787d Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Thu, 14 Jul 2022 15:51:00 +0800 Subject: [PATCH 11/15] fix iwyu Signed-off-by: linjun9528 --- .../include/file_access_ext_ability_module_loader.h | 7 +++++++ .../file_access/include/file_access_ext_connection.h | 7 +++++-- .../file_access/include/file_access_ext_proxy.h | 9 ++++++++- .../file_access/include/file_access_ext_stub.h | 9 +++++++-- .../file_access/include/file_access_ext_stub_impl.h | 4 +++- .../file_access/include/file_access_helper.h | 7 +++++-- .../src/file_access_ext_ability_module_loader.cpp | 4 ++++ .../file_access/src/file_access_ext_connection.cpp | 8 +++++++- .../file_access/src/file_access_ext_proxy.cpp | 6 ++++++ .../file_access/src/file_access_ext_stub.cpp | 12 ++++++++++++ .../file_access/src/file_access_ext_stub_impl.cpp | 2 ++ .../innerkits/file_access/src/file_access_helper.cpp | 2 ++ .../kits/napi/common/file_extension_info_napi.cpp | 7 +++++++ .../kits/napi/common/file_extension_info_napi.h | 2 +- .../file_access_ext_ability_module.cpp | 1 + .../module_export_napi.cpp | 3 +-- services/src/fileoper/file_info.cpp | 6 ++++++ services/src/fileoper/file_info.h | 2 ++ 18 files changed, 86 insertions(+), 12 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h b/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h index fad8b9cf..174bad17 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h @@ -16,7 +16,14 @@ #ifndef FILE_EXT_ABILITY_MODULE_LOADER_H #define FILE_EXT_ABILITY_MODULE_LOADER_H +#include +#include + +#include "extension.h" #include "extension_module_loader.h" +#include "runtime.h" +#include "singleton.h" + namespace OHOS { namespace FileAccessFwk { using namespace AbilityRuntime; diff --git a/frameworks/innerkits/file_access/include/file_access_ext_connection.h b/frameworks/innerkits/file_access/include/file_access_ext_connection.h index e47b0cff..30b2e764 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_connection.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_connection.h @@ -16,11 +16,14 @@ #ifndef FILE_EXT_CONNECTION_H #define FILE_EXT_CONNECTION_H -#include +#include +#include #include "ability_connect_callback_stub.h" -#include "event_handler.h" +#include "element_name.h" #include "ifile_access_ext_base.h" +#include "iremote_object.h" +#include "refbase.h" #include "want.h" namespace OHOS { diff --git a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h index d4918e22..f450951c 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h @@ -16,10 +16,17 @@ #ifndef FILE_EXT_PROXY_H #define FILE_EXT_PROXY_H -#include +#include +#include +#include #include "file_access_extension_info.h" #include "ifile_access_ext_base.h" +#include "iremote_broker.h" +#include "iremote_object.h" +#include "iremote_proxy.h" +#include "refbase.h" +#include "uri.h" namespace OHOS { namespace FileAccessFwk { diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub.h b/frameworks/innerkits/file_access/include/file_access_ext_stub.h index 73c1552a..8c232892 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub.h @@ -16,11 +16,16 @@ #ifndef FILE_EXT_STUB_H #define FILE_EXT_STUB_H -#include +#include + +#include #include -#include "file_access_extension_info.h" #include "ifile_access_ext_base.h" +#include "iremote_stub.h" +#include "message_option.h" +#include "message_parcel.h" +#include "refbase.h" namespace OHOS { namespace FileAccessFwk { diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index 1cd130ba..4ee634a0 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -17,11 +17,13 @@ #define FILE_EXT_STUB_IMPL_H #include +#include #include "file_access_ext_ability.h" #include "file_access_ext_stub.h" #include "file_access_extension_info.h" -#include "native_engine/native_value.h" +#include "js_native_api_types.h" +#include "uri.h" namespace OHOS { namespace FileAccessFwk { diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index be151480..df3899d0 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -16,14 +16,17 @@ #ifndef FILE_ACCESS_HELPER_H #define FILE_ACCESS_HELPER_H -#include +#include +#include #include +#include #include "context.h" #include "file_access_ext_connection.h" #include "file_access_extension_info.h" -#include "hilog_wrapper.h" #include "ifile_access_ext_base.h" +#include "iremote_object.h" +#include "refbase.h" #include "uri.h" #include "want.h" diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability_module_loader.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability_module_loader.cpp index 221ccfad..9e79c4de 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability_module_loader.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability_module_loader.cpp @@ -14,6 +14,10 @@ */ #include "file_access_ext_ability_module_loader.h" + +#include +#include + #include "file_access_ext_ability.h" namespace OHOS { diff --git a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp index e7e96042..76299613 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp @@ -13,11 +13,17 @@ * limitations under the License. */ -#include "file_access_ext_connection.h" +#include + +#include +#include +#include "file_access_ext_connection.h" +#include "ability_connect_callback_interface.h" #include "ability_manager_client.h" #include "file_access_ext_proxy.h" #include "hilog_wrapper.h" +#include "iremote_broker.h" namespace OHOS { namespace FileAccessFwk { diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 46a75442..3d52271c 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -15,9 +15,15 @@ #include "file_access_ext_proxy.h" +#include +#include + #include "file_access_framework_errno.h" #include "hilog_wrapper.h" #include "hitrace_meter.h" +#include "ipc_types.h" +#include "message_option.h" +#include "message_parcel.h" namespace OHOS { namespace FileAccessFwk { diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index ddc2ee80..b0887857 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -15,11 +15,23 @@ #include "file_access_ext_stub.h" +#include +#include +#include +#include +#include +#include + +#include "access_token.h" #include "accesstoken_kit.h" +#include "file_access_extension_info.h" #include "file_access_framework_errno.h" #include "hilog_wrapper.h" #include "hitrace_meter.h" +#include "ipc_object_stub.h" #include "ipc_skeleton.h" +#include "ipc_types.h" +#include "uri.h" namespace OHOS { namespace FileAccessFwk { diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index 26fd26e2..ad2b2167 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -15,6 +15,8 @@ #include "file_access_ext_stub_impl.h" +#include + #include "file_access_framework_errno.h" #include "hilog_wrapper.h" #include "hitrace_meter.h" diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 9a3a497a..30e1dbb9 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -15,6 +15,8 @@ #include "file_access_helper.h" +#include + #include "file_access_framework_errno.h" #include "hilog_wrapper.h" #include "hitrace_meter.h" diff --git a/interfaces/kits/napi/common/file_extension_info_napi.cpp b/interfaces/kits/napi/common/file_extension_info_napi.cpp index 800b6e0c..9673cc9c 100644 --- a/interfaces/kits/napi/common/file_extension_info_napi.cpp +++ b/interfaces/kits/napi/common/file_extension_info_napi.cpp @@ -12,11 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "file_extension_info_napi.h" +#include +#include + #include + #include "file_access_extension_info.h" #include "hilog_wrapper.h" +#include "js_native_api.h" +#include "napi/native_common.h" namespace OHOS { namespace FileAccessFwk { diff --git a/interfaces/kits/napi/common/file_extension_info_napi.h b/interfaces/kits/napi/common/file_extension_info_napi.h index dab3c059..e66a8b02 100644 --- a/interfaces/kits/napi/common/file_extension_info_napi.h +++ b/interfaces/kits/napi/common/file_extension_info_napi.h @@ -16,8 +16,8 @@ #ifndef FILE_EXTENSION_INFO_NAPI_H #define FILE_EXTENSION_INFO_NAPI_H -#include "napi/native_api.h" #include "napi/native_node_api.h" + namespace OHOS { namespace FileAccessFwk { void InitFlag(napi_env env, napi_value exports); diff --git a/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability_module.cpp b/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability_module.cpp index 539d60dd..91e0a700 100644 --- a/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability_module.cpp +++ b/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability_module.cpp @@ -14,6 +14,7 @@ */ #include "native_engine/native_engine.h" +#include "module_manager/native_module_manager.h" extern const char _binary_file_access_ext_ability_js_start[]; extern const char _binary_file_access_ext_ability_js_end[]; diff --git a/interfaces/kits/napi/file_extension_info_module/module_export_napi.cpp b/interfaces/kits/napi/file_extension_info_module/module_export_napi.cpp index 950e3900..b74e8166 100644 --- a/interfaces/kits/napi/file_extension_info_module/module_export_napi.cpp +++ b/interfaces/kits/napi/file_extension_info_module/module_export_napi.cpp @@ -15,10 +15,9 @@ #include "module_export_napi.h" -#include #include "file_extension_info_napi.h" +#include "js_native_api_types.h" #include "napi/native_api.h" -#include "napi/native_node_api.h" namespace OHOS { namespace FileAccessFwk { diff --git a/services/src/fileoper/file_info.cpp b/services/src/fileoper/file_info.cpp index 3eaf9006..d08871a0 100644 --- a/services/src/fileoper/file_info.cpp +++ b/services/src/fileoper/file_info.cpp @@ -12,8 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "file_info.h" + +#include +#include + #include "log.h" + using namespace std; namespace OHOS { diff --git a/services/src/fileoper/file_info.h b/services/src/fileoper/file_info.h index 8a8742b6..b46e662c 100644 --- a/services/src/fileoper/file_info.h +++ b/services/src/fileoper/file_info.h @@ -16,7 +16,9 @@ #define STORAGE_SERVICES_FILE_INFO_H #include +#include #include + #include "parcel.h" namespace OHOS { -- Gitee From e96cd134a46d52c0699fd1a418d73c869b147462 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Thu, 14 Jul 2022 15:54:30 +0800 Subject: [PATCH 12/15] fix iwyu Signed-off-by: linjun9528 --- .../innerkits/file_access/src/file_access_ext_connection.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp index 76299613..b55f4a1d 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp @@ -13,12 +13,13 @@ * limitations under the License. */ +#include "file_access_ext_connection.h" + #include #include #include -#include "file_access_ext_connection.h" #include "ability_connect_callback_interface.h" #include "ability_manager_client.h" #include "file_access_ext_proxy.h" -- Gitee From d154370789f641fca0fb806f2bea6f58819ccd7d Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Thu, 14 Jul 2022 16:13:14 +0800 Subject: [PATCH 13/15] fix iwyu Signed-off-by: linjun9528 --- .../innerkits/file_access/src/file_access_ext_connection.cpp | 3 --- .../innerkits/file_access/src/file_access_ext_proxy.cpp | 3 --- .../innerkits/file_access/src/file_access_ext_stub_impl.cpp | 2 -- frameworks/innerkits/file_access/src/file_access_helper.cpp | 2 -- interfaces/kits/napi/common/file_extension_info_napi.cpp | 5 ++--- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp index b55f4a1d..d553242f 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp @@ -17,9 +17,6 @@ #include -#include -#include - #include "ability_connect_callback_interface.h" #include "ability_manager_client.h" #include "file_access_ext_proxy.h" diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 3d52271c..059331c8 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -15,9 +15,6 @@ #include "file_access_ext_proxy.h" -#include -#include - #include "file_access_framework_errno.h" #include "hilog_wrapper.h" #include "hitrace_meter.h" diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index ad2b2167..26fd26e2 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -15,8 +15,6 @@ #include "file_access_ext_stub_impl.h" -#include - #include "file_access_framework_errno.h" #include "hilog_wrapper.h" #include "hitrace_meter.h" diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 30e1dbb9..9a3a497a 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -15,8 +15,6 @@ #include "file_access_helper.h" -#include - #include "file_access_framework_errno.h" #include "hilog_wrapper.h" #include "hitrace_meter.h" diff --git a/interfaces/kits/napi/common/file_extension_info_napi.cpp b/interfaces/kits/napi/common/file_extension_info_napi.cpp index 9673cc9c..5673104c 100644 --- a/interfaces/kits/napi/common/file_extension_info_napi.cpp +++ b/interfaces/kits/napi/common/file_extension_info_napi.cpp @@ -15,9 +15,8 @@ #include "file_extension_info_napi.h" -#include -#include - +#include +#include #include #include "file_access_extension_info.h" -- Gitee From f9c5208e1a6b816101f4fdc58773ab3d3d3099d8 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Thu, 14 Jul 2022 16:18:33 +0800 Subject: [PATCH 14/15] fix iwyu Signed-off-by: linjun9528 --- .../file_access_ext_ability/file_access_ext_ability_module.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability_module.cpp b/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability_module.cpp index 91e0a700..4d4891b3 100644 --- a/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability_module.cpp +++ b/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability_module.cpp @@ -13,8 +13,8 @@ * limitations under the License. */ -#include "native_engine/native_engine.h" #include "module_manager/native_module_manager.h" +#include "native_engine/native_engine.h" extern const char _binary_file_access_ext_ability_js_start[]; extern const char _binary_file_access_ext_ability_js_end[]; -- Gitee From 9c6d467ac7ae5274e94481561dc03bf2aa33e984 Mon Sep 17 00:00:00 2001 From: shuzhouhao Date: Fri, 15 Jul 2022 18:00:19 +0800 Subject: [PATCH 15/15] revert !155 Switch component ark_ts2abc to arkcompiler_ets_frontend Signed-off-by: shuzhouhao --- interfaces/kits/napi/file_access_ext_ability/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/napi/file_access_ext_ability/BUILD.gn b/interfaces/kits/napi/file_access_ext_ability/BUILD.gn index c049a4c5..c7879905 100644 --- a/interfaces/kits/napi/file_access_ext_ability/BUILD.gn +++ b/interfaces/kits/napi/file_access_ext_ability/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//arkcompiler/ets_frontend/ts2panda/ts2abc_config.gni") +import("//ark/ts2abc/ts2panda/ts2abc_config.gni") import("//build/ohos.gni") ts2abc_gen_abc("gen_file_access_ext_ability_abc") { -- Gitee