From 45cb8048b85e93b257c85e9267ac9f21ce0133a5 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Mon, 27 Jun 2022 20:04:35 +0200
Subject: [PATCH] openharmony: Fix undefined variable in java-tools.inc
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
recipes-openharmony/openharmony/java-tools.inc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/recipes-openharmony/openharmony/java-tools.inc b/recipes-openharmony/openharmony/java-tools.inc
index ca08a43a..f2c6fff1 100644
--- a/recipes-openharmony/openharmony/java-tools.inc
+++ b/recipes-openharmony/openharmony/java-tools.inc
@@ -2,10 +2,11 @@
#
# SPDX-License-Identifier: Apache-2.0
-# Make sure we have java tools in $PATH
+# This is needed for the STAGING_LIBDIR_JVM_NATIVE variable used below
+inherit java
+# Make sure we have java tools in $PATH
DEPENDS:append = " openjdk-8-native"
-INHERIT:append = " java"
JAVA_BUILD_VERSION = "openjdk-8-native"
export JAVA_HOME = "${STAGING_LIBDIR_JVM_NATIVE}/${JAVA_BUILD_VERSION}"
export CLASSPATH += "${STAGING_LIBDIR_JVM_NATIVE}/${JAVA_BUILD_VERSION}/lib/tools.jar"
--
GitLab