From c143f194f428f400b83e1dc0cd0876bf278815f9 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Wed, 6 Jul 2022 11:38:29 +0200
Subject: [PATCH] openharmony.inc: Do not change java preferred providers

By using weak assignment for the java preferred providers, we avoid setting
java preferred provider variables if they are already set.
We should be fine with any valid setting.

Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
 conf/distro/include/java.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/distro/include/java.inc b/conf/distro/include/java.inc
index 1e8ed3ff..2aafb6ab 100644
--- a/conf/distro/include/java.inc
+++ b/conf/distro/include/java.inc
@@ -4,5 +4,5 @@
 
 # Configuration needed by meta-java layer
 
-PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
-PREFERRED_PROVIDER_virtual/java-native = "cacao-native"
+PREFERRED_PROVIDER_virtual/java-initial-native ?= "cacao-initial-native"
+PREFERRED_PROVIDER_virtual/java-native ?= "cacao-native"
-- 
GitLab