From 704361f74e28c1b54eb6d5f620dceaa8f959c117 Mon Sep 17 00:00:00 2001 From: Esben Haabendal <esben.haabendal@huawei.com> Date: Mon, 18 Jul 2022 08:55:37 +0200 Subject: [PATCH] Rename prebuilts folder to sdk This is less ambiguous and aligns with the wording used in Oniro documentation. Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com> --- recipes-openharmony/{prebuilts => sdk}/README.rst | 6 +++--- .../{prebuilts => sdk}/files/build/common/musl/BUILD.gn | 0 .../files/patches/build_gcc-toolchain-gni.patch | 0 .../{prebuilts => sdk}/files/relocate-ld-scripts.sh | 0 recipes-openharmony/{prebuilts => sdk}/files/setup.sh | 0 .../{prebuilts => sdk}/files/third_party.gni | 0 .../{prebuilts => sdk}/files/third_party/musl/BUILD.gn | 0 .../files/third_party/musl/musl_config.gni | 0 recipes-openharmony/{prebuilts => sdk}/files/toolchain.gni | 0 .../{prebuilts => sdk}/oniro-openharmony-bundle.bb | 0 .../oniro-openharmony-target-integration.bb | 0 .../oniro-openharmony-thirdparty-integration-3.0.inc | 0 .../oniro-openharmony-thirdparty-integration-3.1.inc | 0 .../oniro-openharmony-thirdparty-integration.bb | 0 .../oniro-openharmony-toolchain-integration-3.0.inc | 0 .../oniro-openharmony-toolchain-integration-3.1.inc | 0 .../oniro-openharmony-toolchain-integration.bb | 0 .../{prebuilts => sdk}/oniro-openharmony-toolchain.bb | 0 .../{prebuilts => sdk}/openharmony-3.0/BUILD.gn | 0 .../{prebuilts => sdk}/openharmony-3.0/BUILD_host.gn | 0 .../{prebuilts => sdk}/openharmony-3.0/BUILD_target.gn | 0 .../openharmony-3.0/patches/ace_ace_engine.patch | 0 .../openharmony-3.0/patches/ark_js_runtime.patch | 0 .../openharmony-3.0/patches/ark_runtime_core.patch | 0 .../openharmony-3.0/patches/ark_ts2abc.patch | 0 .../openharmony-3.0/patches/build-ninja_args.patch | 0 .../{prebuilts => sdk}/openharmony-3.0/patches/build.patch | 0 .../openharmony-3.0/patches/build_third_party.patch | 0 .../openharmony-3.0/patches/developtools_profiler.patch | 0 .../patches/drivers_adapter_khdf_linux.patch | 0 .../openharmony-3.0/patches/drivers_framework.patch | 0 .../openharmony-3.0/patches/drivers_peripheral.patch | 0 .../openharmony-3.0/patches/kernel_linux_build.patch | 0 .../openharmony-3.0/patches/third_party_e2fsprogs.patch | 0 .../openharmony-3.0/patches/third_party_flutter.patch | 0 .../openharmony-3.0/patches/third_party_grpc.patch | 0 .../openharmony-3.0/patches/third_party_icu.patch | 0 .../openharmony-3.0/third_party/openssl/BUILD.gn | 0 .../{prebuilts => sdk}/openharmony-3.1/BUILD.gn | 0 .../{prebuilts => sdk}/openharmony-3.1/BUILD_host.gn | 0 .../{prebuilts => sdk}/openharmony-3.1/BUILD_target.gn | 0 .../openharmony-3.1/patches/ace_ace_engine.patch | 0 .../openharmony-3.1/patches/ace_napi.patch | 0 .../openharmony-3.1/patches/ark_js_runtime.patch | 0 .../openharmony-3.1/patches/ark_runtime_core.patch | 0 .../openharmony-3.1/patches/ark_ts2abc.patch | 0 .../patches/base_notification_ans_standard.patch | 0 .../openharmony-3.1/patches/base_update_updater.patch | 0 .../openharmony-3.1/patches/base_usb_usb_manager.patch | 0 .../openharmony-3.1/patches/base_user_iam_pin_auth.patch | 0 .../{prebuilts => sdk}/openharmony-3.1/patches/build.patch | 0 .../openharmony-3.1/patches/build_lite.patch | 0 .../openharmony-3.1/patches/build_third_party.patch | 0 .../openharmony-3.1/patches/developtools_hdc_standard.patch | 0 .../openharmony-3.1/patches/developtools_hiperf.patch | 0 .../openharmony-3.1/patches/developtools_profiler.patch | 0 .../patches/drivers_adapter_khdf_linux.patch | 0 .../openharmony-3.1/patches/drivers_framework.patch | 0 .../openharmony-3.1/patches/drivers_peripheral.patch | 0 .../openharmony-3.1/patches/foundation_aafwk_standard.patch | 0 .../patches/foundation_appexecfwk_standard.patch | 0 .../patches/foundation_graphic_standard.patch | 0 .../openharmony-3.1/patches/kernel_linux_build.patch | 0 .../openharmony-3.1/patches/productdefine_common.patch | 0 .../patches/third_party_e2fsprogs-backports-to-3.1.patch | 0 .../openharmony-3.1/patches/third_party_e2fsprogs.patch | 0 .../openharmony-3.1/patches/third_party_flutter.patch | 0 .../openharmony-3.1/patches/third_party_grpc.patch | 0 .../openharmony-3.1/patches/third_party_icu.patch | 0 .../openharmony-3.1/patches/third_party_libevdev.patch | 0 .../openharmony-3.1/patches/third_party_libusb.patch | 0 .../openharmony-3.1/patches/third_party_selinux.patch | 0 .../openharmony-3.1/third_party/openssl/BUILD.gn | 0 recipes-openharmony/{prebuilts => sdk}/sanity-check.inc | 0 74 files changed, 3 insertions(+), 3 deletions(-) rename recipes-openharmony/{prebuilts => sdk}/README.rst (96%) rename recipes-openharmony/{prebuilts => sdk}/files/build/common/musl/BUILD.gn (100%) rename recipes-openharmony/{prebuilts => sdk}/files/patches/build_gcc-toolchain-gni.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/files/relocate-ld-scripts.sh (100%) rename recipes-openharmony/{prebuilts => sdk}/files/setup.sh (100%) rename recipes-openharmony/{prebuilts => sdk}/files/third_party.gni (100%) rename recipes-openharmony/{prebuilts => sdk}/files/third_party/musl/BUILD.gn (100%) rename recipes-openharmony/{prebuilts => sdk}/files/third_party/musl/musl_config.gni (100%) rename recipes-openharmony/{prebuilts => sdk}/files/toolchain.gni (100%) rename recipes-openharmony/{prebuilts => sdk}/oniro-openharmony-bundle.bb (100%) rename recipes-openharmony/{prebuilts => sdk}/oniro-openharmony-target-integration.bb (100%) rename recipes-openharmony/{prebuilts => sdk}/oniro-openharmony-thirdparty-integration-3.0.inc (100%) rename recipes-openharmony/{prebuilts => sdk}/oniro-openharmony-thirdparty-integration-3.1.inc (100%) rename recipes-openharmony/{prebuilts => sdk}/oniro-openharmony-thirdparty-integration.bb (100%) rename recipes-openharmony/{prebuilts => sdk}/oniro-openharmony-toolchain-integration-3.0.inc (100%) rename recipes-openharmony/{prebuilts => sdk}/oniro-openharmony-toolchain-integration-3.1.inc (100%) rename recipes-openharmony/{prebuilts => sdk}/oniro-openharmony-toolchain-integration.bb (100%) rename recipes-openharmony/{prebuilts => sdk}/oniro-openharmony-toolchain.bb (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/BUILD.gn (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/BUILD_host.gn (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/BUILD_target.gn (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/ace_ace_engine.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/ark_js_runtime.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/ark_runtime_core.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/ark_ts2abc.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/build-ninja_args.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/build.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/build_third_party.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/developtools_profiler.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/drivers_adapter_khdf_linux.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/drivers_framework.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/drivers_peripheral.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/kernel_linux_build.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/third_party_e2fsprogs.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/third_party_flutter.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/third_party_grpc.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/patches/third_party_icu.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.0/third_party/openssl/BUILD.gn (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/BUILD.gn (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/BUILD_host.gn (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/BUILD_target.gn (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/ace_ace_engine.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/ace_napi.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/ark_js_runtime.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/ark_runtime_core.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/ark_ts2abc.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/base_notification_ans_standard.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/base_update_updater.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/base_usb_usb_manager.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/base_user_iam_pin_auth.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/build.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/build_lite.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/build_third_party.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/developtools_hdc_standard.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/developtools_hiperf.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/developtools_profiler.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/drivers_adapter_khdf_linux.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/drivers_framework.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/drivers_peripheral.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/foundation_aafwk_standard.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/foundation_appexecfwk_standard.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/foundation_graphic_standard.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/kernel_linux_build.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/productdefine_common.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/third_party_e2fsprogs-backports-to-3.1.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/third_party_e2fsprogs.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/third_party_flutter.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/third_party_grpc.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/third_party_icu.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/third_party_libevdev.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/third_party_libusb.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/patches/third_party_selinux.patch (100%) rename recipes-openharmony/{prebuilts => sdk}/openharmony-3.1/third_party/openssl/BUILD.gn (100%) rename recipes-openharmony/{prebuilts => sdk}/sanity-check.inc (100%) diff --git a/recipes-openharmony/prebuilts/README.rst b/recipes-openharmony/sdk/README.rst similarity index 96% rename from recipes-openharmony/prebuilts/README.rst rename to recipes-openharmony/sdk/README.rst index 3243e278..1e77c7da 100644 --- a/recipes-openharmony/prebuilts/README.rst +++ b/recipes-openharmony/sdk/README.rst @@ -2,10 +2,10 @@ .. .. SPDX-License-Identifier: CC-BY-4.0 -.. _OpenHarmony prebuilts: +.. _OpenHarmony SDK: -OpenHarmony prebuilts -##################### +OpenHarmony SDK +############### There are two different recipes providing a prebuilts for the OpenHarmony build system. diff --git a/recipes-openharmony/prebuilts/files/build/common/musl/BUILD.gn b/recipes-openharmony/sdk/files/build/common/musl/BUILD.gn similarity index 100% rename from recipes-openharmony/prebuilts/files/build/common/musl/BUILD.gn rename to recipes-openharmony/sdk/files/build/common/musl/BUILD.gn diff --git a/recipes-openharmony/prebuilts/files/patches/build_gcc-toolchain-gni.patch b/recipes-openharmony/sdk/files/patches/build_gcc-toolchain-gni.patch similarity index 100% rename from recipes-openharmony/prebuilts/files/patches/build_gcc-toolchain-gni.patch rename to recipes-openharmony/sdk/files/patches/build_gcc-toolchain-gni.patch diff --git a/recipes-openharmony/prebuilts/files/relocate-ld-scripts.sh b/recipes-openharmony/sdk/files/relocate-ld-scripts.sh similarity index 100% rename from recipes-openharmony/prebuilts/files/relocate-ld-scripts.sh rename to recipes-openharmony/sdk/files/relocate-ld-scripts.sh diff --git a/recipes-openharmony/prebuilts/files/setup.sh b/recipes-openharmony/sdk/files/setup.sh similarity index 100% rename from recipes-openharmony/prebuilts/files/setup.sh rename to recipes-openharmony/sdk/files/setup.sh diff --git a/recipes-openharmony/prebuilts/files/third_party.gni b/recipes-openharmony/sdk/files/third_party.gni similarity index 100% rename from recipes-openharmony/prebuilts/files/third_party.gni rename to recipes-openharmony/sdk/files/third_party.gni diff --git a/recipes-openharmony/prebuilts/files/third_party/musl/BUILD.gn b/recipes-openharmony/sdk/files/third_party/musl/BUILD.gn similarity index 100% rename from recipes-openharmony/prebuilts/files/third_party/musl/BUILD.gn rename to recipes-openharmony/sdk/files/third_party/musl/BUILD.gn diff --git a/recipes-openharmony/prebuilts/files/third_party/musl/musl_config.gni b/recipes-openharmony/sdk/files/third_party/musl/musl_config.gni similarity index 100% rename from recipes-openharmony/prebuilts/files/third_party/musl/musl_config.gni rename to recipes-openharmony/sdk/files/third_party/musl/musl_config.gni diff --git a/recipes-openharmony/prebuilts/files/toolchain.gni b/recipes-openharmony/sdk/files/toolchain.gni similarity index 100% rename from recipes-openharmony/prebuilts/files/toolchain.gni rename to recipes-openharmony/sdk/files/toolchain.gni diff --git a/recipes-openharmony/prebuilts/oniro-openharmony-bundle.bb b/recipes-openharmony/sdk/oniro-openharmony-bundle.bb similarity index 100% rename from recipes-openharmony/prebuilts/oniro-openharmony-bundle.bb rename to recipes-openharmony/sdk/oniro-openharmony-bundle.bb diff --git a/recipes-openharmony/prebuilts/oniro-openharmony-target-integration.bb b/recipes-openharmony/sdk/oniro-openharmony-target-integration.bb similarity index 100% rename from recipes-openharmony/prebuilts/oniro-openharmony-target-integration.bb rename to recipes-openharmony/sdk/oniro-openharmony-target-integration.bb diff --git a/recipes-openharmony/prebuilts/oniro-openharmony-thirdparty-integration-3.0.inc b/recipes-openharmony/sdk/oniro-openharmony-thirdparty-integration-3.0.inc similarity index 100% rename from recipes-openharmony/prebuilts/oniro-openharmony-thirdparty-integration-3.0.inc rename to recipes-openharmony/sdk/oniro-openharmony-thirdparty-integration-3.0.inc diff --git a/recipes-openharmony/prebuilts/oniro-openharmony-thirdparty-integration-3.1.inc b/recipes-openharmony/sdk/oniro-openharmony-thirdparty-integration-3.1.inc similarity index 100% rename from recipes-openharmony/prebuilts/oniro-openharmony-thirdparty-integration-3.1.inc rename to recipes-openharmony/sdk/oniro-openharmony-thirdparty-integration-3.1.inc diff --git a/recipes-openharmony/prebuilts/oniro-openharmony-thirdparty-integration.bb b/recipes-openharmony/sdk/oniro-openharmony-thirdparty-integration.bb similarity index 100% rename from recipes-openharmony/prebuilts/oniro-openharmony-thirdparty-integration.bb rename to recipes-openharmony/sdk/oniro-openharmony-thirdparty-integration.bb diff --git a/recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration-3.0.inc b/recipes-openharmony/sdk/oniro-openharmony-toolchain-integration-3.0.inc similarity index 100% rename from recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration-3.0.inc rename to recipes-openharmony/sdk/oniro-openharmony-toolchain-integration-3.0.inc diff --git a/recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration-3.1.inc b/recipes-openharmony/sdk/oniro-openharmony-toolchain-integration-3.1.inc similarity index 100% rename from recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration-3.1.inc rename to recipes-openharmony/sdk/oniro-openharmony-toolchain-integration-3.1.inc diff --git a/recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration.bb b/recipes-openharmony/sdk/oniro-openharmony-toolchain-integration.bb similarity index 100% rename from recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration.bb rename to recipes-openharmony/sdk/oniro-openharmony-toolchain-integration.bb diff --git a/recipes-openharmony/prebuilts/oniro-openharmony-toolchain.bb b/recipes-openharmony/sdk/oniro-openharmony-toolchain.bb similarity index 100% rename from recipes-openharmony/prebuilts/oniro-openharmony-toolchain.bb rename to recipes-openharmony/sdk/oniro-openharmony-toolchain.bb diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/BUILD.gn b/recipes-openharmony/sdk/openharmony-3.0/BUILD.gn similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/BUILD.gn rename to recipes-openharmony/sdk/openharmony-3.0/BUILD.gn diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/BUILD_host.gn b/recipes-openharmony/sdk/openharmony-3.0/BUILD_host.gn similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/BUILD_host.gn rename to recipes-openharmony/sdk/openharmony-3.0/BUILD_host.gn diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/BUILD_target.gn b/recipes-openharmony/sdk/openharmony-3.0/BUILD_target.gn similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/BUILD_target.gn rename to recipes-openharmony/sdk/openharmony-3.0/BUILD_target.gn diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/ace_ace_engine.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/ace_ace_engine.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/ace_ace_engine.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/ace_ace_engine.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/ark_js_runtime.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/ark_js_runtime.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/ark_js_runtime.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/ark_js_runtime.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/ark_runtime_core.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/ark_runtime_core.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/ark_runtime_core.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/ark_runtime_core.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/ark_ts2abc.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/ark_ts2abc.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/ark_ts2abc.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/ark_ts2abc.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/build-ninja_args.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/build-ninja_args.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/build-ninja_args.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/build-ninja_args.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/build.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/build.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/build.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/build.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/build_third_party.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/build_third_party.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/build_third_party.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/build_third_party.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/developtools_profiler.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/developtools_profiler.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/developtools_profiler.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/developtools_profiler.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/drivers_adapter_khdf_linux.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/drivers_adapter_khdf_linux.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/drivers_adapter_khdf_linux.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/drivers_adapter_khdf_linux.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/drivers_framework.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/drivers_framework.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/drivers_framework.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/drivers_framework.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/drivers_peripheral.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/drivers_peripheral.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/drivers_peripheral.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/drivers_peripheral.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/kernel_linux_build.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/kernel_linux_build.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/kernel_linux_build.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/kernel_linux_build.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/third_party_e2fsprogs.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/third_party_e2fsprogs.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/third_party_e2fsprogs.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/third_party_e2fsprogs.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/third_party_flutter.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/third_party_flutter.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/third_party_flutter.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/third_party_flutter.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/third_party_grpc.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/third_party_grpc.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/third_party_grpc.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/third_party_grpc.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/third_party_icu.patch b/recipes-openharmony/sdk/openharmony-3.0/patches/third_party_icu.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/patches/third_party_icu.patch rename to recipes-openharmony/sdk/openharmony-3.0/patches/third_party_icu.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/third_party/openssl/BUILD.gn b/recipes-openharmony/sdk/openharmony-3.0/third_party/openssl/BUILD.gn similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.0/third_party/openssl/BUILD.gn rename to recipes-openharmony/sdk/openharmony-3.0/third_party/openssl/BUILD.gn diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/BUILD.gn b/recipes-openharmony/sdk/openharmony-3.1/BUILD.gn similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/BUILD.gn rename to recipes-openharmony/sdk/openharmony-3.1/BUILD.gn diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/BUILD_host.gn b/recipes-openharmony/sdk/openharmony-3.1/BUILD_host.gn similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/BUILD_host.gn rename to recipes-openharmony/sdk/openharmony-3.1/BUILD_host.gn diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/BUILD_target.gn b/recipes-openharmony/sdk/openharmony-3.1/BUILD_target.gn similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/BUILD_target.gn rename to recipes-openharmony/sdk/openharmony-3.1/BUILD_target.gn diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/ace_ace_engine.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/ace_ace_engine.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/ace_ace_engine.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/ace_ace_engine.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/ace_napi.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/ace_napi.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/ace_napi.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/ace_napi.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/ark_js_runtime.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/ark_js_runtime.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/ark_js_runtime.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/ark_js_runtime.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/ark_runtime_core.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/ark_runtime_core.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/ark_runtime_core.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/ark_runtime_core.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/ark_ts2abc.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/ark_ts2abc.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/ark_ts2abc.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/ark_ts2abc.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/base_notification_ans_standard.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/base_notification_ans_standard.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/base_notification_ans_standard.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/base_notification_ans_standard.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/base_update_updater.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/base_update_updater.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/base_update_updater.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/base_update_updater.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/base_usb_usb_manager.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/base_usb_usb_manager.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/base_usb_usb_manager.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/base_usb_usb_manager.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/base_user_iam_pin_auth.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/base_user_iam_pin_auth.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/base_user_iam_pin_auth.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/base_user_iam_pin_auth.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/build.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/build.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/build.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/build.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/build_lite.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/build_lite.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/build_lite.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/build_lite.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/build_third_party.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/build_third_party.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/build_third_party.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/build_third_party.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/developtools_hdc_standard.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/developtools_hdc_standard.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/developtools_hdc_standard.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/developtools_hdc_standard.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/developtools_hiperf.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/developtools_hiperf.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/developtools_hiperf.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/developtools_hiperf.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/developtools_profiler.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/developtools_profiler.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/developtools_profiler.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/developtools_profiler.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/drivers_adapter_khdf_linux.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/drivers_adapter_khdf_linux.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/drivers_adapter_khdf_linux.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/drivers_adapter_khdf_linux.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/drivers_framework.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/drivers_framework.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/drivers_framework.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/drivers_framework.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/drivers_peripheral.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/drivers_peripheral.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/drivers_peripheral.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/drivers_peripheral.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/foundation_aafwk_standard.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/foundation_aafwk_standard.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/foundation_aafwk_standard.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/foundation_aafwk_standard.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/foundation_appexecfwk_standard.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/foundation_appexecfwk_standard.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/foundation_appexecfwk_standard.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/foundation_appexecfwk_standard.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/foundation_graphic_standard.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/foundation_graphic_standard.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/foundation_graphic_standard.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/foundation_graphic_standard.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/kernel_linux_build.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/kernel_linux_build.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/kernel_linux_build.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/kernel_linux_build.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/productdefine_common.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/productdefine_common.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/productdefine_common.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/productdefine_common.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_e2fsprogs-backports-to-3.1.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/third_party_e2fsprogs-backports-to-3.1.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_e2fsprogs-backports-to-3.1.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/third_party_e2fsprogs-backports-to-3.1.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_e2fsprogs.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/third_party_e2fsprogs.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_e2fsprogs.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/third_party_e2fsprogs.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_flutter.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/third_party_flutter.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_flutter.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/third_party_flutter.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_grpc.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/third_party_grpc.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_grpc.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/third_party_grpc.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_icu.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/third_party_icu.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_icu.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/third_party_icu.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_libevdev.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/third_party_libevdev.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_libevdev.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/third_party_libevdev.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_libusb.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/third_party_libusb.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_libusb.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/third_party_libusb.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_selinux.patch b/recipes-openharmony/sdk/openharmony-3.1/patches/third_party_selinux.patch similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/patches/third_party_selinux.patch rename to recipes-openharmony/sdk/openharmony-3.1/patches/third_party_selinux.patch diff --git a/recipes-openharmony/prebuilts/openharmony-3.1/third_party/openssl/BUILD.gn b/recipes-openharmony/sdk/openharmony-3.1/third_party/openssl/BUILD.gn similarity index 100% rename from recipes-openharmony/prebuilts/openharmony-3.1/third_party/openssl/BUILD.gn rename to recipes-openharmony/sdk/openharmony-3.1/third_party/openssl/BUILD.gn diff --git a/recipes-openharmony/prebuilts/sanity-check.inc b/recipes-openharmony/sdk/sanity-check.inc similarity index 100% rename from recipes-openharmony/prebuilts/sanity-check.inc rename to recipes-openharmony/sdk/sanity-check.inc -- GitLab