Merge remote branch 'upstream/main' into 'main'

Change-Id: I38247995d18cb5cf2fe55ad736b2bea09fe3b3a4
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/android.googlesource.com/platform/system/libbase/+/1474981
Reviewed-by: Étienne J. Membrives <etiennej@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
new file mode 100644
index 0000000..e28e9cb
--- /dev/null
+++ b/BUILD.gn
@@ -0,0 +1,11 @@
+# Copyright 2021 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+config("headers") {
+  include_dirs = [ "include" ]
+}
+
+source_set("libbase") {
+  public_configs = [ ":headers" ]
+}

file.cpp

diff --git a/file.cpp b/file.cpp
index 55671b7..f8f58b9 100644
--- a/file.cpp
+++ b/file.cpp
@@ -508,6 +508,8 @@
   return path;
 #elif defined(__EMSCRIPTEN__)
   abort();
+#elif defined(__Fuchsia__)
+  return "";
 #else
 #error unknown OS
 #endif