diff --git a/core/envsetup.mk b/core/envsetup.mk
index 1c3a1b3b6b..3271079abc 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -255,6 +255,7 @@ endif
 HOST_PREBUILT_ARCH := x86
 # This is the standard way to name a directory containing prebuilt host
 # objects. E.g., prebuilt/$(HOST_PREBUILT_TAG)/cc
+# This must match the logic in get_host_prebuilt_prefix in envsetup.sh
 HOST_PREBUILT_TAG := $(BUILD_OS)-$(HOST_PREBUILT_ARCH)
 
 # TARGET_COPY_OUT_* are all relative to the staging directory, ie PRODUCT_OUT.
diff --git a/envsetup.sh b/envsetup.sh
index 50fec5146a..ff3c3a60eb 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -196,6 +196,19 @@ function get_build_var()
     (\cd $T; build/soong/soong_ui.bash --dumpvar-mode $1)
 }
 
+# This logic matches envsetup.mk
+function get_host_prebuilt_prefix
+{
+  local un=$(uname)
+  if [[ $un == "Linux" ]] ; then
+    echo linux-x86
+  elif [[ $un == "Darwin" ]] ; then
+    echo darwin-x86
+  else
+    echo "Error: Invalid host operating system: $un" 1>&2
+  fi
+}
+
 # check to see if the supplied product is one we can build
 function check_product()
 {