Skip to content
Snippets Groups Projects
Commit e6c2a6e1 authored by Thierry Escande's avatar Thierry Escande
Browse files

openharmony-standard: Add openharmony-3.1 recipe


Signed-off-by: default avatarThierry Escande <thierry.escande@huawei.com>
Signed-off-by: default avatarEsben Haabendal <esben.haabendal@huawei.com>
parent d8108fce
No related branches found
No related tags found
No related merge requests found
Showing
with 28192 additions and 0 deletions
......@@ -6,6 +6,7 @@ DEPENDS += "oniro-openharmony-bundle oniro-openharmony-toolchain-integration-nat
DEPENDS += "gn-native ninja-native"
DEPENDS += "hc-gen-native"
DEPENDS += "clang-native compiler-rt-native libcxx-native"
DEPENDS += "openssl-native"
do_configure_oniro_ohos[dirs] = "${S}"
do_configure_oniro_ohos() {
......
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
This diff is collapsed.
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
Patch for //developtools/ace-js2bundle git repository of OpenHarmony 3.1 codebase.
This tricks os.path.relpath() to point to the Yocto native node.
Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
Upstream-Status: Inappropriate
diff --git a/BUILD.gn b/BUILD.gn
index 86206bd..4373c18 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -46,7 +46,7 @@ action("build_ace_loader_library") {
# different host platform nodejs tool directory
if (host_os == "linux") {
if (is_standard_system) {
- nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v12.18.4-linux-x64/bin/node"
+ nodejs_path = "//../recipe-sysroot-native/usr/bin/node"
} else {
nodejs_path =
"//prebuilts/ace-toolkit/nodejs/node-v12.18.4-linux-x64/bin/node"
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
Patch for //foundation/ace/ace_engine git repository of OpenHarmony 3.1 codebase.
Remove unused variable as gn complains about it.
Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
Upstream-Status: Inappropriate
diff --git a/frameworks/core/accessibility/js_inspector/BUILD.gn b/frameworks/core/accessibility/js_inspector/BUILD.gn
index 763b4b747..7ad9cd0eb 100644
--- a/frameworks/core/accessibility/js_inspector/BUILD.gn
+++ b/frameworks/core/accessibility/js_inspector/BUILD.gn
@@ -78,7 +78,7 @@ template("js_inspector") {
}
foreach(item, ace_platforms) {
- platform = item.name
+ #platform = item.name
js_inspector("js_inspector_" + item.name) {
defines = []
config = {
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
Workaround for problem with nodejs 17 and openssl 3.0
error:0308010C:digital envelope routines::unsupported
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
Upstream-Status: Inappropriate
diff --git a/build/tools/build_js.py b/build/tools/build_js.py
index e2d26c792970..b9c83a907ace 100755
--- a/build/tools/build_js.py
+++ b/build/tools/build_js.py
@@ -29,6 +29,7 @@ def main(argv):
buildEnv = os.environ
buildEnv["PATH"] = nodejs_path + ":" + buildEnv["PATH"]
+ buildEnv["NODE_OPTIONS"] = "--openssl-legacy-provider"
interface_target_path = os.path.join(target_out_path, "interface")
if os.path.exists(interface_target_path):
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
Patch for //foundation/ace/ace_engine git repository of OpenHarmony 3.1 codebase.
This disables ace_engine win and mac platform
Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
Upstream-Status: Inappropriate
diff --git a/adapter/preview/build/platform.gni b/adapter/preview/build/platform.gni
index 6798d40d7..a2460ab89 100644
--- a/adapter/preview/build/platform.gni
+++ b/adapter/preview/build/platform.gni
@@ -16,7 +16,7 @@ import("config.gni")
platforms = []
-if (use_mingw_win || true) {
+if (use_mingw_win) {
windows_platform = {
name = "windows"
config = {
@@ -27,7 +27,7 @@ if (use_mingw_win || true) {
platforms += [ windows_platform ]
}
-if (use_mac || true) {
+if (use_mac) {
mac_platform = {
name = "mac"
config = {
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
Fix build of unittest.
Apply to base/account/os_account repository.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
Upstream-Status: Pending
diff --git a/test/systemtest/common/resource/fuzzTest/src/fuzz_test_manager.cpp b/test/systemtest/common/resource/fuzzTest/src/fuzz_test_manager.cpp
index a09edd597f1c..4567666c9cee 100644
--- a/test/systemtest/common/resource/fuzzTest/src/fuzz_test_manager.cpp
+++ b/test/systemtest/common/resource/fuzzTest/src/fuzz_test_manager.cpp
@@ -19,7 +19,6 @@
#include "app_account_manager.h"
#include "fuzz_config_parser.h"
#include "getparam.h"
-#include "hilog_wrapper.h"
#undef private
#undef protected
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
Don't waste time on trying to build windows and mac tools.
Apply to repo base/global/resmgr_standard repository.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
Upstream-Status: Inappropriate
diff --git a/bundle.json b/bundle.json
index e06db271fd40..2b152058d0d7 100644
--- a/bundle.json
+++ b/bundle.json
@@ -56,9 +56,7 @@
"sub_component": [
"//base/global/resmgr_standard/interfaces/js/kits:resourcemanager",
"//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
- "//base/global/resmgr_standard/frameworks/resmgr:librawfile",
- "//base/global/resmgr_standard/frameworks/resmgr:win_resmgr",
- "//base/global/resmgr_standard/frameworks/resmgr:mac_resmgr"
+ "//base/global/resmgr_standard/frameworks/resmgr:librawfile"
],
"inner_kits": [
{
@@ -88,4 +86,4 @@
]
}
}
-}
\ No newline at end of file
+}
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
Remove path prefix so bison executable can be found even if not in the
standard binary location.
Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
Upstream-Status: Inappropriate
--- a/parser.sh
+++ b/parser.sh
@@ -1 +1 @@
-/usr/bin/bison $*
+bison $*
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
Patch for //build git repository of OpenHarmony 3.1 codebase.
This tricks rebase_path() to point to the Yocto native node.
Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
Upstream-Status: Inappropriate
diff --git a/ohos_var.gni b/ohos_var.gni
index 4993234..8ffa632 100755
--- a/ohos_var.gni
+++ b/ohos_var.gni
@@ -181,7 +181,7 @@ nodejs_version = "v12.18.4"
if (host_os == "mac") {
nodejs = "//prebuilts/build-tools/common/nodejs/node-${nodejs_version}-darwin-x64/bin/node"
} else {
- nodejs = "//prebuilts/build-tools/common/nodejs/node-${nodejs_version}-${host_os}-x64/bin/node"
+ nodejs = "//../recipe-sysroot-native/usr/bin/node"
}
default_hap_private_key_path = "OpenHarmony Application Release"
default_signature_algorithm = "SHA256withECDSA"
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
Patch for //drivers/peripheral git repository of OpenHarmony 3.1 codebase.
Force inclusion of rpi3 camera config.
Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
Upstream-Status: Inappropriate
diff --git a/camera/hal/camera.gni b/camera/hal/camera.gni
index df003b68..eb35a853 100755
--- a/camera/hal/camera.gni
+++ b/camera/hal/camera.gni
@@ -17,7 +17,7 @@ if (defined(ohos_lite)) {
"//device/soc/hisilicon/common/hal/media/camera/hi3516dv300/linux_standard/camera/product.gni")
} else {
import("//build/ohos.gni")
- if ("${product_name}" == "ohos-arm64") {
+ if (true) {
import(
"//drivers/peripheral/camera/hal/adapter/chipset/rpi/rpi3/device/camera/product.gni")
} else if ("${product_name}" == "Hi3516DV300") {
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