commit 4379c035601fa1ed22f188e9075f7fa6163a076c
author Steven Moreland <smoreland@google.com> Fri Dec 08 19:35:31 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 08 19:35:31 2017 +0000
tree 7db03e80b3f940b133f9847a72be1d2f68abccd3
parent 7cdfa0441eb7fe1928be95808f1e85a3c05b240a
parent e9fb979b1ec662e348c03806e78f3e3982b24dc8

Merge "Revert "Remove conditional vndbinder usage in CAS.""

cas/1.0/default/Android.bp

diff --git a/cas/1.0/default/Android.bp b/cas/1.0/default/Android.bp
index 544162b..6da5cc4 100644
--- a/cas/1.0/default/Android.bp
+++ b/cas/1.0/default/Android.bp
@@ -12,6 +12,12 @@
       "TypeConvert.cpp",
     ],
 
+    product_variables: {
+        treble: {
+            cflags: ["-DUSE_VNDBINDER"],
+        },
+    },
+
     compile_multilib: "32",
     init_rc: ["android.hardware.cas@1.0-service.rc"],
 

cas/1.0/default/service.cpp

diff --git a/cas/1.0/default/service.cpp b/cas/1.0/default/service.cpp
index 04a8ad9..3f1df5a 100644
--- a/cas/1.0/default/service.cpp
+++ b/cas/1.0/default/service.cpp
@@ -31,9 +31,11 @@
 int main() {
     ALOGD("android.hardware.cas@1.0-service starting...");
 
+#ifdef USE_VNDBINDER
     // The CAS HAL may communicate to other vendor components via
     // /dev/vndbinder
     android::ProcessState::initWithDriver("/dev/vndbinder");
+#endif // USE_VNDBINDER
 
     configureRpcThreadpool(8, true /* callerWillJoin */);