commit e9fb979b1ec662e348c03806e78f3e3982b24dc8
author Steven Moreland <smoreland@google.com> Fri Dec 08 19:32:38 2017 +0000
committer Steven Moreland <smoreland@google.com> Fri Dec 08 19:34:26 2017 +0000
tree 27bf7a7a397b5a4c27b8008f86f24e700e45dd2f
parent 5884a6f0f3059643c98eff76ddd69f6c1dd79d1f

Revert "Remove conditional vndbinder usage in CAS."

This reverts commit 5884a6f0f3059643c98eff76ddd69f6c1dd79d1f.
Bug: 70393284

Reason for revert: Fugu doesn't have vndbinder yet.
Exempt-from-owner-approval: Device doesn't boot.

Change-Id: Ib23691c102fd8aca63a4a6755eb7fd1f9e852a4d

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