commit 231626d43dec18ee1307adef29dfc8241fc6d5a8
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 15 20:07:21 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 15 20:07:21 2017 +0000
tree 09d7f940f0b063dfac9b8fab84fc7118e3d37e9d
parent 18e599af8e7df482292da28816455c7407e257aa
parent 75673fc6acdaa3e71493f6597be89fbdbc9e3b3c

Merge "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 6da5cc4..544162b 100644
--- a/cas/1.0/default/Android.bp
+++ b/cas/1.0/default/Android.bp
@@ -12,12 +12,6 @@
       "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 3f1df5a..04a8ad9 100644
--- a/cas/1.0/default/service.cpp
+++ b/cas/1.0/default/service.cpp
@@ -31,11 +31,9 @@
 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 */);