未验证 提交 16940bbd 编写于 作者: O openharmony_ci 提交者: Gitee

!847 Remove neardetect form blacklist

Merge pull request !847 from liweihui/master
...@@ -3633,8 +3633,7 @@ static int dlclose_impl(struct dso *p) ...@@ -3633,8 +3633,7 @@ static int dlclose_impl(struct dso *p)
static char* dlclose_deps_black_list[] = static char* dlclose_deps_black_list[] =
{ {
"/system/lib/libhidebug.so", "/system/lib/libhidebug.so",
"/system/lib64/libhidebug.so", "/system/lib64/libhidebug.so",
"/system/lib64/libmsdp_neardetect_algorithm.z.so",
"/vendor/lib64/libhril_hdf.z.so" "/vendor/lib64/libhril_hdf.z.so"
}; };
...@@ -3658,7 +3657,7 @@ static int do_dlclose(struct dso *p) ...@@ -3658,7 +3657,7 @@ static int do_dlclose(struct dso *p)
memcpy(deps_bak, p->deps, deps_num*sizeof(struct dso*)); memcpy(deps_bak, p->deps, deps_num*sizeof(struct dso*));
} }
LD_LOGI("do_dlclose name=%{public}s count=%{public}d by_dlopen=%{public}d", p->name, p->nr_dlopen, p->by_dlopen); LD_LOGI("do_dlclose name=%{public}s count=%{public}d by_dlopen=%{public}d", p->name, p->nr_dlopen, p->by_dlopen);
dlclose_impl(p); dlclose_impl(p);
if (ldclose_deps) { if (ldclose_deps) {
...@@ -5130,4 +5129,4 @@ static void handle_relro_sharing(struct dso *p, const dl_extinfo *extinfo, ssize ...@@ -5130,4 +5129,4 @@ static void handle_relro_sharing(struct dso *p, const dl_extinfo *extinfo, ssize
if (runtime) longjmp(*rtld_fail, 1); if (runtime) longjmp(*rtld_fail, 1);
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册