commit 96bbc5ca87b0cfbcab3bd9e5fc49b71420bf3c08
author Steven Moreland <smoreland@google.com> Wed Dec 13 14:11:26 2017 -0800
committer Steven Moreland <smoreland@google.com> Wed Dec 13 14:11:26 2017 -0800
tree 1980633e8aa554996f4c16a85e0e976bf34d80fe
parent 78b40e8fe1f37de319344c92d8e6e1eb595c1067

Use treble_linker_namespace instead of treble.

More specific. Treble is being removed.

Bug: 62019611
Test: manual
Change-Id: I94c21c6a5cb6a258bfb36a0b7da23abdc73a67fb

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 3ec75ee..38e3e99 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1419,8 +1419,8 @@
         },
     },
     product_variables: {
-        treble: {
-            cflags: ["-D__ANDROID_TREBLE__"],
+        treble_linker_namespaces: {
+            cflags: ["-DTREBLE_LINKER_NAMESPACES"],
         },
     },
     cppflags: ["-Wold-style-cast"],

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 41162e9..1352815 100644
--- a/libc/bionic/__bionic_get_shell_path.cpp
+++ b/libc/bionic/__bionic_get_shell_path.cpp
@@ -40,7 +40,7 @@
    * in $PATH for the vendor shell, simply return the system shell.
    */
 
-#ifdef __ANDROID_TREBLE__
+#ifdef TREBLE_LINKER_NAMESPACES
   /* look for /system or /vendor prefix */
   char exe_path[strlen(VENDOR_PREFIX)];
   ssize_t len = readlink("/proc/self/exe", exe_path, sizeof(exe_path));