commit 9ffa4ae47b63e21e70c163ec42041bfb8142acf9
author Elliott Hughes <enh@google.com> Fri Dec 15 23:43:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 15 23:43:42 2017 +0000
tree 070858bb78ae5a76f362186313bd94cefdffbb5c
parent b9d5a87b1b63095d7ad7a3d87d8d110d1662fcaa
parent a7f12944d4154a445ee774683e27447d609de540

Merge "A few more trivial tests."

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 52e53e2..1017fa5 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1420,8 +1420,8 @@
         },
     },
     product_variables: {
-        treble: {
-            cflags: ["-D__ANDROID_TREBLE__"],
+        treble_linker_namespaces: {
+            cflags: ["-DTREBLE_LINKER_NAMESPACES"],
         },
     },
     whole_static_libs: ["libpropertyinfoparser"],

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));