Simplify preprocessor conditionals in header

Author: smallp-o-p

libcxx/include/__text_encoding/te_impl.h

@@ -525,44 +525,18 @@ struct __te_impl {
   }
 
 #  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
   _LIBCPP_HIDDEN static __te_impl __get_locale_encoding(const char* __name);
   _LIBCPP_HIDDEN static __te_impl __get_env_encoding();
+#    if defined(_LIBCPP_WIN32API)
+  _LIBCPP_HIDDEN static __id __get_win32_acp();
+#    endif
 
   [[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;

libcxx/src/text_encoding.cpp

@@ -248,7 +248,10 @@ _LIBCPP_HIDDEN __te_impl __te_impl::__get_env_encoding() {
 __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.
+
+// TODO: Stubs for Android that shouldn't be accessible from any public interface.
+_LIBCPP_HIDDEN __te_impl __te_impl::__get_locale_encoding(const char* __name [[maybe_unused]]) { return __te_impl(); }
+_LIBCPP_HIDDEN __te_impl __te_impl::__get_env_encoding() { return __te_impl(); }
 __te_impl __te_impl::__environment() { return __te_impl(); }
 #endif
 _LIBCPP_END_NAMESPACE_STD