From 0654be5b4edf78c3e3d2395ced878c59d354e464 Mon Sep 17 00:00:00 2001
From: Robin Liu <renfeng@google.com>
Date: Mon, 16 Oct 2023 15:48:30 -0400
Subject: [PATCH] Enable read environment variable on Android

This fixs: #430
---
 src/common/platform_utils.hpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/common/platform_utils.hpp b/src/common/platform_utils.hpp
index d047c17d9..6a6d7aa67 100644
--- a/src/common/platform_utils.hpp
+++ b/src/common/platform_utils.hpp
@@ -327,14 +327,19 @@ static inline std::string PlatformUtilsGetSecureEnv(const char* name) {
 
 #include <sys/system_properties.h>
 
-static inline bool PlatformUtilsGetEnvSet(const char* /* name */) {
-    // Stub func
-    return false;
-}
+namespace detail {
 
-static inline std::string PlatformUtilsGetEnv(const char* /* name */) {
-    // Stub func
-    return {};
+static inline char* ImplGetEnv(const char* name) { return getenv(name); }
+}  // namespace detail
+
+static inline bool PlatformUtilsGetEnvSet(const char* name) { return detail::ImplGetEnv(name) != nullptr; }
+
+static inline std::string PlatformUtilsGetEnv(const char* name) {
+    auto str = detail::ImplGetEnv(name);
+    if (str == nullptr) {
+        return {};
+    }
+    return str;
 }
 
 static inline std::string PlatformUtilsGetSecureEnv(const char* /* name */) {