From 75673fc6acdaa3e71493f6597be89fbdbc9e3b3c Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Wed, 29 Nov 2017 12:51:31 -0800
Subject: [PATCH] Remove conditional vndbinder usage in CAS.

Platform consistency, removing overload of meaning
behind PRODUCT_FULL_TREBLE/treble variable.

Bug: 67975337
Test: boot
Change-Id: I09df37fc0306f80879424334029ab9668cee9d4f
Merged-In: I09df37fc0306f80879424334029ab9668cee9d4f
---
 cas/1.0/default/Android.bp  | 6 ------
 cas/1.0/default/service.cpp | 2 --
 2 files changed, 8 deletions(-)

diff --git a/cas/1.0/default/Android.bp b/cas/1.0/default/Android.bp
index 6da5cc442c..544162ba40 100644
--- a/cas/1.0/default/Android.bp
+++ b/cas/1.0/default/Android.bp
@@ -12,12 +12,6 @@ cc_binary {
       "TypeConvert.cpp",
     ],
 
-    product_variables: {
-        treble: {
-            cflags: ["-DUSE_VNDBINDER"],
-        },
-    },
-
     compile_multilib: "32",
     init_rc: ["android.hardware.cas@1.0-service.rc"],
 
diff --git a/cas/1.0/default/service.cpp b/cas/1.0/default/service.cpp
index 3f1df5a511..04a8ad9729 100644
--- a/cas/1.0/default/service.cpp
+++ b/cas/1.0/default/service.cpp
@@ -31,11 +31,9 @@ using android::hardware::cas::V1_0::IMediaCasService;
 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 */);