From 886370c2402e6fcf6ac613a8603f99fff66cd20c Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 21 Mar 2019 21:11:41 -0700 Subject: Fix internal uses of _PATH_BSHELL. We regressed on this recently: code under the upstream-* directories has _PATH_BSHELL defined as a call to __bionic_get_shell_path(). In our own code, we may as well just call it directly. Bug: https://issuetracker.google.com/129030706 Test: ran tests Change-Id: Ic2423f521272be95e67f94771772fe8072636ef0 --- libc/bionic/__bionic_get_shell_path.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libc/bionic/__bionic_get_shell_path.cpp') diff --git a/libc/bionic/__bionic_get_shell_path.cpp b/libc/bionic/__bionic_get_shell_path.cpp index 135281578..7aeed182e 100644 --- a/libc/bionic/__bionic_get_shell_path.cpp +++ b/libc/bionic/__bionic_get_shell_path.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#include "private/__bionic_get_shell_path.h" + #include #include #include @@ -51,7 +53,7 @@ static const char* init_sh_path() { return "/system/bin/sh"; } -__LIBC_HIDDEN__ extern "C" const char* __bionic_get_shell_path() { +const char* __bionic_get_shell_path() { static const char* sh_path = init_sh_path(); return sh_path; } -- cgit v1.2.3