openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-12-02 16:06:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2287 [fix] adapt x86

Browse Source 
Merge pull request !2287 from chenshixu1/master
This commit is contained in:
openharmony_ci 2023-10-12 10:40:35 +00:00 committed by Gitee
commit 0bbce8a656
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
14 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interfaces/innerkits/BUILD.gn
View File

@ -186,7 +186,7 @@ if (defined(ohos_lite)) {
"INIT_AGENT",
"_GNU_SOURCE",
]
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
defines += [ "SUPPORT_64BIT" ]
}
@ -295,7 +295,7 @@ if (defined(ohos_lite)) {
"INIT_AGENT",
"_GNU_SOURCE",
]
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
defines += [ "SUPPORT_64BIT" ]
}

2
services/etc/BUILD.gn
View File

@ -129,7 +129,7 @@ if (defined(ohos_lite)) {
part_name = "init"
subsystem_name = "startup"
extra_paras = []
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
extra_paras += [ "const.product.cpu.abilist=arm64-v8a" ]
}
if (build_variant == "user") {

2
services/init/standard/BUILD.gn
View File

@ -155,7 +155,7 @@ ohos_executable("init") {
]
}
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
defines += [ "SUPPORT_64BIT" ]
}

2
services/modules/bootchart/BUILD.gn
View File

@ -30,7 +30,7 @@ ohos_shared_library("bootchart") {
part_name = "init"
subsystem_name = "startup"
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
module_install_dir = "lib64/init"
} else {
module_install_dir = "lib/init"

2
services/modules/init_context/BUILD.gn
View File

@ -48,7 +48,7 @@ ohos_shared_library("init_context") {
part_name = "init"
subsystem_name = "startup"
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
module_install_dir = "lib64/init"
} else {
module_install_dir = "lib/init"

2
services/modules/init_eng/BUILD.gn
View File

@ -35,7 +35,7 @@ ohos_shared_library("init_eng") {
part_name = "init"
subsystem_name = "startup"
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
module_install_dir = "lib64/init"
} else {
module_install_dir = "lib/init"

2
services/modules/reboot/BUILD.gn
View File

@ -31,7 +31,7 @@ ohos_shared_library("rebootmodule") {
defines = []
part_name = "init"
subsystem_name = "startup"
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
module_install_dir = "lib64/init/reboot"
} else {
module_install_dir = "lib/init/reboot"

2
services/modules/selinux/BUILD.gn
View File

@ -39,7 +39,7 @@ ohos_shared_library("selinuxadp") {
part_name = "init"
subsystem_name = "startup"
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
module_install_dir = "lib64/init"
} else {
module_install_dir = "lib/init"

2
services/modules/sysevent/BUILD.gn
View File

@ -36,7 +36,7 @@ ohos_shared_library("eventmodule") {
part_name = "init"
subsystem_name = "startup"
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
module_install_dir = "lib64/init"
} else {
module_install_dir = "lib/init"

2
services/modules/trace/BUILD.gn
View File

@ -36,7 +36,7 @@ ohos_shared_library("inittrace") {
part_name = "init"
subsystem_name = "startup"
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
module_install_dir = "lib64/init"
} else {
module_install_dir = "lib/init"

2
services/modules/udid/BUILD.gn
View File

@ -86,7 +86,7 @@ if (defined(ohos_lite)) {
part_name = "init"
subsystem_name = "startup"
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
module_install_dir = "lib64/init"
} else {
module_install_dir = "lib/init"

2
services/param/adapter/param_selinux.c
View File

@ -25,7 +25,7 @@
#include "selinux_parameter.h"
#endif
#ifdef __aarch64__
#if defined (__aarch64__) || defined(__x86_64__)
#define CHECKER_LIB_NAME "/system/lib64/libparaperm_checker.z.so"
#define CHECKER_UPDATER_LIB "/lib64/libparaperm_checker.z.so"
#else

6
services/sandbox/BUILD.gn
View File

@ -34,7 +34,7 @@ ohos_static_library("sandbox") {
"//base/startup/init/services/include",
"//base/startup/init/interfaces/innerkits/include",
]
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
defines = [ "SUPPORT_64BIT" ]
}
deps = [
@ -48,7 +48,7 @@ ohos_static_library("sandbox") {
}
ohos_prebuilt_etc("system-sandbox.json") {
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
source = "system-sandbox64.json"
} else {
source = "system-sandbox.json"
@ -60,7 +60,7 @@ ohos_prebuilt_etc("system-sandbox.json") {
}
ohos_prebuilt_etc("chipset-sandbox.json") {
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
source = "chipset-sandbox64.json"
} else {
source = "chipset-sandbox.json"

2
test/unittest/BUILD.gn
View File

@ -301,7 +301,7 @@ ohos_unittest("init_unittest") {
]
defines += [ "_GNU_SOURCE" ]
if (target_cpu == "arm64") {
if (target_cpu == "arm64" || target_cpu == "x86_64") {
defines += [ "SUPPORT_64BIT" ]
}
if (use_musl) {