Skip to content
Snippets Groups Projects
Commit 9e5c9242 authored by Kristijonas Čiulčinskas's avatar Kristijonas Čiulčinskas
Browse files

Disable hdc_std


developtools_hdc_standard.patch: remove hdc_std which it's not need as we have
a separate recipe for the host tool
openharmony-stadard_3.1.bb: remove libusb which was only dependand on hdc_std

Signed-off-by: Kristijonas Čiulčinskas's avatarKristijonas Ciulcinskas <kristijonas.ciulcinskas@huawei.com>
parent a34c10bf
No related branches found
No related tags found
1 merge request!62Disable hdc_std
Pipeline #7280 passed
......@@ -212,8 +212,6 @@ do_install () {
# Workaround! Build system does not install libcrypto.z.so (boringssl), so
# we install it manually for now
cp ${B}/developtools/profiler/libcrypto.z.so ${D}${libdir}/
# Same for libusb_shared.z.so
cp ${B}/common/common/libusb_shared.z.so ${D}${libdir}/
}
inherit update-alternatives
......@@ -381,7 +379,6 @@ OPENHARMONY_PARTS += "startup:init"
OPENHARMONY_PARTS += "startup:startup_l2"
OPENHARMONY_PARTS += "telephony:core_service"
OPENHARMONY_PARTS += "telephony:ril_adapter"
OPENHARMONY_PARTS += "usb:libusb_shared"
OPENHARMONY_PARTS += "useriam:auth_executor_mgr"
OPENHARMONY_PARTS += "useriam:pin_auth"
OPENHARMONY_PARTS += "useriam:user_auth"
......
......@@ -4,31 +4,37 @@
Patch for //developtools/hdc_standard git repository of OpenHarmony 3.1 codebase.
Only build for linux host using host toolchain.
Disable hdc_std since there is a separate recipe for the host tool.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
Signed-off-by: Kristijonas Ciulcinskas <kristijonas.ciulcinskas@huawei.com>
Signed-off-by: Grzegorz Gwóźdź <grzegorz.gwozdz@huawei.com>
Upstream-Status: Inappropriate [configuration/integration]
diff --git a/developtools/hdc_standard/BUILD.gn b/developtools/hdc_standard/BUILD.gn
index b2c1cfbeea4a..8b4eeaa1fc1f 100644
--- a/developtools/hdc_standard/BUILD.gn
+++ b/developtools/hdc_standard/BUILD.gn
@@ -194,25 +194,13 @@ group("hdc_target_standard") {
@@ -188,32 +188,12 @@ ohos_executable("hdc_std") {
group("hdc_target_standard") {
deps = [
- ":hdc_std",
":hdcd",
]
}
group("hdc_target_standard_linux") {
-group("hdc_target_standard_linux") {
- deps = [ ":hdc_std(//build/toolchain/linux:clang_x64)" ]
-}
-
-group("hdc_target_standard_mingw") {
- deps = [ ":hdc_std(//build/toolchain/mingw:mingw_x86_64)" ]
+ deps = [ ":hdc_std($host_toolchain)" ]
}
-}
-
group("hdc_target_standard_all") {
deps = [
":hdc_target_standard",
":hdc_target_standard_linux",
- deps = [
- ":hdc_target_standard",
- ":hdc_target_standard_linux",
- ":hdc_target_standard_mingw",
- ]
-}
......@@ -37,6 +43,8 @@ index b2c1cfbeea4a..8b4eeaa1fc1f 100644
- deps = [
- ":hdc_target_standard",
- ":hdc_target_standard_mingw",
]
- ]
+ deps = [ ":hdc_target_standard" ]
}
group("hdc_all") {
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment