Use environment() and environment_is() stubs for android

Author: smallp-o-p

libcxx/include/__text_encoding/te_impl.h

@@ -524,19 +524,47 @@ struct __te_impl {
 #  endif
   }
 
-#  if _LIBCPP_HAS_LOCALIZATION && !defined(__ANDROID__)
-  _LIBCPP_HIDDEN static __te_impl __get_locale_encoding(const char* __name);
-#  if defined(_LIBCPP_WIN32API)
+#  if _LIBCPP_HAS_LOCALIZATION
+  // TODO: Android has <langinfo.h> but not nl_langinfo_l which is required to implement this function.
+#    if !defined(__ANDROID__)
+#      if defined(_LIBCPP_WIN32API)
   _LIBCPP_HIDDEN static __id __get_win32_acp();
-#  endif
+#      endif
+  _LIBCPP_HIDDEN static __te_impl __get_locale_encoding(const char* __name);
   _LIBCPP_HIDDEN static __te_impl __get_env_encoding();
+
   [[nodiscard]] _LIBCPP_EXPORTED_FROM_ABI static __te_impl __environment();
 
   template <__id _Id>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static bool __environment_is() {
     return __environment() == _Id;
   }
+
+#    else
+  _LIBCPP_HIDDEN static __te_impl __get_locale_encoding(const char* __name) = delete;
+  _LIBCPP_HIDDEN static __te_impl __get_env_encoding()                      = delete;
+
+  [[nodiscard]] _LIBCPP_EXPORTED_FROM_ABI static __te_impl __environment();
+
+  template <__id _Id>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static bool __environment_is() {
+    return false;
+  }
+#    endif
+
+#  else
+
+#    if defined(_LIBCPP_WIN32API)
+  _LIBCPP_HIDDEN static __id __get_win32_acp() = delete;
+#    endif
+  _LIBCPP_HIDDEN static __te_impl __get_locale_encoding(const char* __name) = delete;
+  _LIBCPP_HIDDEN static __te_impl __get_env_encoding()                      = delete;
+  [[nodiscard]] _LIBCPP_EXPORTED_FROM_ABI static __te_impl __environment()  = delete;
+  template <__id _Id>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static bool __environment_is() = delete;
+
 #  endif
+
   const __te_data* __encoding_rep_     = __text_encoding_data + 1;
   char __name_[__max_name_length_ + 1] = {0};
 

libcxx/include/text_encoding

@@ -115,6 +115,11 @@ public:
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static bool environment_is() {
     return __te_impl::__environment_is<_Id>();
   }
+#    else
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static text_encoding environment() = delete;
+
+  template <id _Id>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static bool environment_is() = delete;
 #    endif
 };
 

libcxx/src/text_encoding.cpp

@@ -210,6 +210,7 @@ _LIBCPP_HIDDEN __te_impl::__id __te_impl::__get_win32_acp() {
 }
 #endif // _LIBCPP_WIN32API
 
+#if !defined(__ANDROID__)
 _LIBCPP_HIDDEN __te_impl __te_impl::__get_locale_encoding(const char* __name) {
   __te_impl __e;
 
@@ -237,13 +238,17 @@ _LIBCPP_HIDDEN __te_impl __te_impl::__get_locale_encoding(const char* __name) {
 }
 
 _LIBCPP_HIDDEN __te_impl __te_impl::__get_env_encoding() {
-#if defined(_LIBCPP_WIN32API)
+#  if defined(_LIBCPP_WIN32API)
   return __te_impl(__get_win32_acp());
-#else
+#  else
   return __get_locale_encoding("");
-#endif // _LIBCPP_WIN32API
+#  endif // _LIBCPP_WIN32API
 }
 
 __te_impl __te_impl::__environment() { return __te_impl::__get_env_encoding(); }
 
+#else
+// TODO: Android stub which will always return unknown, should be inaccessible from the main text_encoding interface.
+__te_impl __te_impl::__environment() { return __te_impl(); }
+#endif
 _LIBCPP_END_NAMESPACE_STD