diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.1.bb b/recipes-openharmony/openharmony/openharmony-standard_3.1.bb index af18b1817ad6c8bca113225767b0320aef076cce..02a68519d45a6597dda58b0d4949223a2d06fb58 100644 --- a/recipes-openharmony/openharmony/openharmony-standard_3.1.bb +++ b/recipes-openharmony/openharmony/openharmony-standard_3.1.bb @@ -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" diff --git a/recipes-openharmony/sdk/openharmony-3.1/patches/developtools_hdc_standard.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/developtools_hdc_standard.patch index 08702f1ceec7dfed8c32d50c321446c76bccc1b2..bb73a626c68dab7c02aa1f6b28799dbb3ac61607 100644 --- a/recipes-openharmony/sdk/openharmony-3.1/patches/developtools_hdc_standard.patch +++ b/recipes-openharmony/sdk/openharmony-3.1/patches/developtools_hdc_standard.patch @@ -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