From d885f301671d4c587139a98cbc2ee3e60fc5e541 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Mon, 27 Jun 2022 17:17:04 +0200
Subject: [PATCH] openharmony: Drop distro override in java-tools.include

This allows using java-tools.inc, and thus openharmony-standard,
hapsigner-native and packing-tool-native recipes with any distro configuration.
These recipes should only be used for OpenHarmony enabled distro configurations
anyway.

Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
 recipes-openharmony/openharmony/java-tools.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes-openharmony/openharmony/java-tools.inc b/recipes-openharmony/openharmony/java-tools.inc
index 98e2859e..ca08a43a 100644
--- a/recipes-openharmony/openharmony/java-tools.inc
+++ b/recipes-openharmony/openharmony/java-tools.inc
@@ -4,9 +4,9 @@
 
 # Make sure we have java tools in $PATH
 
-DEPENDS:append:oniro-openharmony-linux = " openjdk-8-native"
-INHERIT:append:oniro-openharmony-linux = " java"
-JAVA_BUILD_VERSION:oniro-openharmony-linux = "openjdk-8-native"
-export JAVA_HOME:oniro-openharmony-linux = "${STAGING_LIBDIR_JVM_NATIVE}/${JAVA_BUILD_VERSION}"
-export CLASSPATH:oniro-openharmony-linux += "${STAGING_LIBDIR_JVM_NATIVE}/${JAVA_BUILD_VERSION}/lib/tools.jar"
-EXTRANATIVEPATH:append:oniro-openharmony-linux = " ../${baselib}/jvm/${JAVA_BUILD_VERSION}/bin"
+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"
+EXTRANATIVEPATH:append = " ../${baselib}/jvm/${JAVA_BUILD_VERSION}/bin"
-- 
GitLab