commit ab2f79c0daa113ceaacaa59c4573ba606ab7de15
author Jayant Chowdhary <jchowdhary@google.com> Fri Sep 01 16:29:44 2017 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Thu Sep 07 17:19:21 2017 -0700
tree 47b2c3045044274ff6a1413f106ed96cb4e8874c
parent 04503da174b5e51ba9035fb79521a6a2af17c111

For devices which are not treble enabled, return the system shell.

For treble enabled devices, still return the appropriate shell depending
on whether the process is a vendor process or a system one.

Test: Manual testing: on a bullhead device, ran test programs from
      /vendor/bin which used popen() and system(). The calls succeeded.

Bug: 65054230

Bug: 64516799

Merged-In: I15dfdbb107cfca7c0f92f337c9bb46b9876eb38e
Change-Id: I15dfdbb107cfca7c0f92f337c9bb46b9876eb38e
(cherry picked from commit 1e52871773505edf70d10a3af7b003e9320ef6a3)

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 204ad19..62ac512 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1567,7 +1567,11 @@
             srcs: ["bionic/mmap.cpp"],
         },
     },
-
+    product_variables: {
+        treble: {
+            cflags: ["-D__ANDROID_TREBLE__"],
+        },
+    },
     cppflags: ["-Wold-style-cast"],
     local_include_dirs: ["stdio"],
     include_dirs: ["bionic/libstdc++/include"],