Signed-off-by: Mupceet <laiguizhong@huawei.com>
Change-Id: I9b8f738e351fb9aff4b79a445f757ec47240fa98
This commit is contained in:
Mupceet
2022-06-24 15:43:33 +08:00
parent 5b2632bcef
commit 03dcd00f9d
6 changed files with 17 additions and 17 deletions
+3 -3
View File
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/startup/init_lite/begetd.gni")
import("//base/startup/init/begetd.gni")
import("//build/lite/config/component/lite_component.gni")
import("//build/lite/ndk/ndk.gni")
@@ -27,9 +27,9 @@ ndk_lib("parameter_notes") {
deps = [ "//base/startup/syspara_lite/frameworks/parameter/src:sysparam" ]
head_files = [ "//base/startup/syspara_lite/interfaces/kits" ]
} else {
deps = [ "//base/startup/init_lite/interfaces/innerkits:libbegetutil" ]
deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
head_files =
[ "//base/startup/init_lite/interfaces/innerkits/include/syspara" ]
[ "//base/startup/init/interfaces/innerkits/include/syspara" ]
}
}
+3 -3
View File
@@ -10,7 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/startup/init_lite/begetd.gni")
import("//base/startup/init/begetd.gni")
import("../config.gni")
if (ohos_kernel_type == "liteos_m") {
@@ -49,14 +49,14 @@ if (ohos_kernel_type == "liteos_m") {
"DATA_PATH=\"${config_ohos_startup_syspara_lite_data_path}\"",
]
} else {
deps = [ "//base/startup/init_lite/interfaces/innerkits:libbegetutil" ]
deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
}
}
} else {
shared_library("sysparam") {
cflags = [ "-Wall" ]
public_deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil",
"//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_shared",
]
}
+1 -1
View File
@@ -33,7 +33,7 @@ if (ohos_build_type == "debug" && ohos_kernel_type == "liteos_a") {
sources = [ "parameter_test.cpp" ]
deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil",
"//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_shared",
]
}
+2 -2
View File
@@ -17,7 +17,7 @@ config("syspara_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"//base/startup/init_lite/services/include/param",
"//base/startup/init/services/include/param",
"//base/startup/syspara_lite/adapter/native/syspara/include",
"//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include",
]
@@ -34,7 +34,7 @@ ohos_shared_library("sysparam_hal") {
configs = [ ":syspara_config" ]
deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil",
"//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [ "utils_base:utils" ]
+4 -4
View File
@@ -39,13 +39,13 @@ config("syspara_public_config") {
ohos_shared_library("syspara") {
include_dirs = [
"include",
"//base/startup/init_lite/services/include/param",
"//base/startup/init/services/include/param",
"//base/startup/syspara_lite/adapter/native/syspara/include",
]
configs = [ ":syspara_config" ]
public_configs = [ ":syspara_public_config" ]
deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil_static",
"//base/startup/init/interfaces/innerkits:libbegetutil_static",
"//utils/native/base:utils",
]
subsystem_name = "startup"
@@ -59,7 +59,7 @@ ohos_shared_library("syspara") {
ohos_shared_library("syspara_watchagent") {
include_dirs = [
"include",
"//base/startup/init_lite/services/include/param",
"//base/startup/init/services/include/param",
"//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include",
]
sources = [ "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/src/param_watchagent.cpp" ]
@@ -67,7 +67,7 @@ ohos_shared_library("syspara_watchagent") {
public_configs = [ ":syspara_public_config" ]
if (paramapi_feature_watcher) {
deps = [
"//base/startup/init_lite/interfaces/innerkits:libbeget_proxy",
"//base/startup/init/interfaces/innerkits:libbeget_proxy",
"//utils/native/base:utils",
]
} else {
+4 -4
View File
@@ -22,8 +22,8 @@ ohos_shared_library("deviceinfo1") {
sources = [ "src/native_deviceinfo_js.cpp" ]
deps = [
"//base/startup/init_lite/interfaces/innerkits:libbeget_proxy",
"//base/startup/init_lite/interfaces/innerkits:libbegetutil",
"//base/startup/init/interfaces/innerkits:libbeget_proxy",
"//base/startup/init/interfaces/innerkits:libbegetutil",
]
external_deps = [ "napi:ace_napi" ]
relative_install_dir = "module"
@@ -40,8 +40,8 @@ ohos_shared_library("systemparameter1") {
]
deps = [
"//base/startup/init_lite/interfaces/innerkits:libbeget_proxy",
"//base/startup/init_lite/interfaces/innerkits:libbegetutil",
"//base/startup/init/interfaces/innerkits:libbeget_proxy",
"//base/startup/init/interfaces/innerkits:libbegetutil",
]
external_deps = [