Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Musl
提交
57fd7a6e
T
Third Party Musl
项目概览
OpenHarmony
/
Third Party Musl
1 年多 前同步成功
通知
37
Star
125
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Musl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
57fd7a6e
编写于
4月 14, 2023
作者:
O
openharmony_ci
提交者:
Gitee
4月 14, 2023
浏览文件
操作
浏览文件
下载
差异文件
!865 Add ndk namespace
Merge pull request !865 from yinchuang/add_ndk_namesapce_1
上级
7be45ea0
daab55bd
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
18 addition
and
8 deletion
+18
-8
porting/linux/user/config/ld-musl-namespace-aarch64.ini
porting/linux/user/config/ld-musl-namespace-aarch64.ini
+4
-2
porting/linux/user/config/ld-musl-namespace-arm.ini
porting/linux/user/config/ld-musl-namespace-arm.ini
+4
-2
porting/linux/user/config/ld-musl-namespace-x86_64.ini
porting/linux/user/config/ld-musl-namespace-x86_64.ini
+4
-2
porting/linux/user/ldso/namespace.c
porting/linux/user/ldso/namespace.c
+4
-1
porting/linux/user/ldso/ns_config.c
porting/linux/user/ldso/ns_config.c
+2
-1
未找到文件。
porting/linux/user/config/ld-musl-namespace-aarch64.ini
浏览文件 @
57fd7a6e
[section.dir.map]
[section.dir.map]
acquiescence
=
/
acquiescence
=
/
system/bin:/vendor/bin:/data/local/tmp
[acquiescence]
[acquiescence]
namespace.default.lib.paths
=
/system/lib64:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/ndk:/system/lib64/chipset-pub-sdk:/system/lib64/chipset-sdk:/system/lib64/platformsdk:/system/lib64/priv-platformsdk:/system/lib64/priv-module:/system/lib64/module:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib64/module/security:/system/lib:/vendor/lib:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib:/vendor/lib64/hw
added.nslist
=
ndk
namespace.ndk.lib.paths
=
/system/lib64/ndk:/system/lib/ndk
namespace.default.lib.paths
=
/system/lib64:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/chipset-pub-sdk:/system/lib64/chipset-sdk:/system/lib64/platformsdk:/system/lib64/priv-platformsdk:/system/lib64/priv-module:/system/lib64/module:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib64/module/security:/system/lib:/vendor/lib:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib:/vendor/lib64/hw
namespace.default.asan.lib.paths
=
/system/lib64:/system/lib64/module:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib64/module/security:/system/lib:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib:/vendor/lib64/hw
namespace.default.asan.lib.paths
=
/system/lib64:/system/lib64/module:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib64/module/security:/system/lib:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib:/vendor/lib64/hw
porting/linux/user/config/ld-musl-namespace-arm.ini
浏览文件 @
57fd7a6e
[section.dir.map]
[section.dir.map]
acquiescence
=
/
acquiescence
=
/
system/bin:/vendor/bin:/data/local/tmp
[acquiescence]
[acquiescence]
namespace.default.lib.paths
=
/system/lib:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/system/lib/module/security:/lib:/usr/local/lib:/usr/lib
added.nslist
=
ndk
namespace.ndk.lib.paths
=
/system/lib/ndk
namespace.default.lib.paths
=
/system/lib:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/system/lib/module/security:/lib:/usr/local/lib:/usr/lib
namespace.default.asan.lib.paths
=
/system/lib:/system/lib/module:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/module/data:/system/lib/module/multimedia:/system/lib/module/security:/lib:/usr/local/lib:/usr/lib
namespace.default.asan.lib.paths
=
/system/lib:/system/lib/module:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/module/data:/system/lib/module/multimedia:/system/lib/module/security:/lib:/usr/local/lib:/usr/lib
porting/linux/user/config/ld-musl-namespace-x86_64.ini
浏览文件 @
57fd7a6e
[section.dir.map]
[section.dir.map]
acquiescence
=
/
acquiescence
=
/
system/bin:/vendor/bin:/data/local/tmp
[acquiescence]
[acquiescence]
namespace.default.lib.paths
=
/system/lib64:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/ndk:/system/lib64/chipset-pub-sdk:/system/lib64/chipset-sdk:/system/lib64/platformsdk:/system/lib64/priv-platformsdk:/system/lib64/priv-module:/system/lib64/module:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib64/module/security:/lib64
added.nslist
=
ndk
namespace.ndk.lib.paths
=
/system/lib64/ndk:/system/lib/ndk
namespace.default.lib.paths
=
/system/lib64:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/chipset-pub-sdk:/system/lib64/chipset-sdk:/system/lib64/platformsdk:/system/lib64/priv-platformsdk:/system/lib64/priv-module:/system/lib64/module:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib64/module/security:/lib64
namespace.default.asan.lib.paths
=
/system/lib64:/system/lib64/module:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib64/module/security:/lib64
namespace.default.asan.lib.paths
=
/system/lib64:/system/lib64/module:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib64/module/security:/lib64
porting/linux/user/ldso/namespace.c
浏览文件 @
57fd7a6e
...
@@ -37,6 +37,8 @@ static nslist g_ns_list;
...
@@ -37,6 +37,8 @@ static nslist g_ns_list;
#define UT_STATIC static
#define UT_STATIC static
#endif
#endif
#define ALLOW_ALL_SHARED_LIBS "allow_all_shared_libs"
static
ns_inherit_list
*
nsinherits_alloc
()
static
ns_inherit_list
*
nsinherits_alloc
()
{
{
ns_inherit_list
*
nsinl
;
ns_inherit_list
*
nsinl
;
...
@@ -584,7 +586,8 @@ bool is_sharable(ns_inherit *inherit, const char *lib_name)
...
@@ -584,7 +586,8 @@ bool is_sharable(ns_inherit *inherit, const char *lib_name)
{
{
if
(
inherit
&&
lib_name
&&
inherit
->
shared_libs
)
{
if
(
inherit
&&
lib_name
&&
inherit
->
shared_libs
)
{
for
(
size_t
i
=
0
;
i
<
inherit
->
shared_libs
->
num
;
i
++
)
{
for
(
size_t
i
=
0
;
i
<
inherit
->
shared_libs
->
num
;
i
++
)
{
if
(
strcmp
(
inherit
->
shared_libs
->
strs
[
i
],
lib_name
)
==
0
)
{
if
(
strcmp
(
inherit
->
shared_libs
->
strs
[
i
],
lib_name
)
==
0
||
strcmp
(
inherit
->
shared_libs
->
strs
[
i
],
ALLOW_ALL_SHARED_LIBS
)
==
0
)
{
LD_LOGD
(
"is_sharable inherit [%{public}s] lib_name [%{public}s] found, return true."
,
LD_LOGD
(
"is_sharable inherit [%{public}s] lib_name [%{public}s] found, return true."
,
inherit
->
inherited_ns
->
ns_name
,
inherit
->
inherited_ns
->
ns_name
,
lib_name
);
lib_name
);
...
...
porting/linux/user/ldso/ns_config.c
浏览文件 @
57fd7a6e
...
@@ -512,8 +512,9 @@ static int config_parse(const char *file_path, const char *exe_path)
...
@@ -512,8 +512,9 @@ static int config_parse(const char *file_path, const char *exe_path)
if
(
sname
)
break
;
if
(
sname
)
break
;
}
}
if
(
!
sname
)
{
if
(
!
sname
)
{
/* No matched section found, use the default section. */
sname
=
ATTR_NS_ACQUIESCENCE
;
LD_LOGD
(
"config_parse no section found!"
);
LD_LOGD
(
"config_parse no section found!"
);
return
-
4
;
/* no section found */
}
}
if
(
!
(
g_configor
.
kvs
=
config_get_kvs
(
sname
)))
{
if
(
!
(
g_configor
.
kvs
=
config_get_kvs
(
sname
)))
{
LD_LOGD
(
"config_parse no section key-value list found!"
);
LD_LOGD
(
"config_parse no section key-value list found!"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录