From cc08a4d3ac03ec0feccf429adb0bf1f9ab46a569 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Mon, 1 Aug 2022 13:54:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- applications/kitframework/BUILD.gn | 4 ++-- applications/kitframework_ipcamera/BUILD.gn | 4 ++-- security_lite/deviceauth_basic_deps/BUILD.gn | 12 ++++++------ startup_lite/syspara_hal/BUILD.gn | 2 +- startup_lite/syspara_posix/BUILD.gn | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/applications/kitframework/BUILD.gn b/applications/kitframework/BUILD.gn index 3ba527417..cc603dd53 100644 --- a/applications/kitframework/BUILD.gn +++ b/applications/kitframework/BUILD.gn @@ -9,7 +9,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # 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. +# limitations under the License. import("//test/xts/tools/lite/build/suite_lite.gni") @@ -26,7 +26,7 @@ hctest_suite("ActsKitFwkApiTest") { "//third_party/bounds_checking_function/include/", "//third_party/mbedtls/include/", "//third_party/cJSON/", - "//base/startup/syspara_lite/interfaces/kits/", + "//base/startup/init/interfaces/innerkits/include/syspara", # dir for oem_auth_config.h and oem_auth_result_storage.h "//vendor/kitframework/include/", diff --git a/applications/kitframework_ipcamera/BUILD.gn b/applications/kitframework_ipcamera/BUILD.gn index 50714eff0..37e7e224a 100644 --- a/applications/kitframework_ipcamera/BUILD.gn +++ b/applications/kitframework_ipcamera/BUILD.gn @@ -9,7 +9,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # 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. +# limitations under the License. import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/hap_pack.gni") @@ -24,7 +24,7 @@ executable("ActsKitFwkApiTest") { "//third_party/cJSON", "//third_party/mbedtls/include/", "//third_party/bounds_checking_function/include/", - "//base/startup/syspara_lite/interfaces/kits/", + "//base/startup/init/interfaces/innerkits/include/syspara", # dir for oem_auth_config.h and oem_auth_result_storage.h "//vendor/kitframework/include/", diff --git a/security_lite/deviceauth_basic_deps/BUILD.gn b/security_lite/deviceauth_basic_deps/BUILD.gn index 500a2a1b9..32b188341 100644 --- a/security_lite/deviceauth_basic_deps/BUILD.gn +++ b/security_lite/deviceauth_basic_deps/BUILD.gn @@ -59,9 +59,9 @@ hctest_suite("ActsSecurityHichainBasicDeps") { ] if (ohos_kernel_type == "liteos_m") { # liteos m - include_dirs += [ "//base/startup/syspara_lite/interfaces/kits" ] + include_dirs += [ "//base/startup/init/interfaces/innerkits/include/syspara" ] deps += - [ "//base/startup/syspara_lite/frameworks/parameter/src:sysparam" ] + [ "//base/startup/init/interfaces/innerkits:libbegetutil" ] if (board_name == "rtl8720") { cflags += [ "-isystem${ohos_root_path}/kernel/liteos_m/kal/posix/include" ] @@ -134,19 +134,19 @@ hctest_suite("ActsSecurityHichainBasicDeps") { } } else { #liteos a or L1 linux - include_dirs += [ "//base/startup/syspara_lite/interfaces/kits" ] + include_dirs += [ "//base/startup/init/interfaces/innerkits/include/syspara" ] deps += - [ "//base/startup/syspara_lite/frameworks/parameter/src:sysparam" ] + [ "//base/startup/init/interfaces/innerkits:libbegetutil" ] } } else { # linux include_dirs += [ - "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", + "//base/startup/init/interfaces/innerkits/include/syspara", "//base/security/device_auth/deps_adapter/os_adapter/interfaces/linux", ] deps += [ - "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", + "//base/startup/init/interfaces/innerkits:libbegetutil", ] } } diff --git a/startup_lite/syspara_hal/BUILD.gn b/startup_lite/syspara_hal/BUILD.gn index 23b3244fb..b9f1f6356 100755 --- a/startup_lite/syspara_hal/BUILD.gn +++ b/startup_lite/syspara_hal/BUILD.gn @@ -23,7 +23,7 @@ hctest_suite("ActsParameterTest") { include_dirs = [ "src", - "//base/startup/syspara_lite/interfaces/kits", + "///base/startup/init/interfaces/innerkits/include/syspara", ] cflags = [ "-Wno-error" ] } diff --git a/startup_lite/syspara_posix/BUILD.gn b/startup_lite/syspara_posix/BUILD.gn index 0c433d058..7a1829a4a 100755 --- a/startup_lite/syspara_posix/BUILD.gn +++ b/startup_lite/syspara_posix/BUILD.gn @@ -19,10 +19,10 @@ hcpptest_suite("ActsParameterTest") { include_dirs = [ "src", - "//base/startup/syspara_lite/interfaces/kits", + "//base/startup/init/interfaces/innerkits/include/syspara", ] - deps = [ "//base/startup/syspara_lite/frameworks/parameter:parameter" ] + deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ] cflags = [ "-Wno-error" ] ldflags = [ "-lstdc++", -- GitLab