summaryrefslogtreecommitdiffstats
path: root/cas
diff options
context:
space:
mode:
authorTreeHugger Robot2017-12-13 22:01:11 -0600
committerAndroid (Google) Code Review2017-12-13 22:01:11 -0600
commit6658796be0ff2b460940e204c5e0b8105989ebb9 (patch)
tree314a03dc018805ba624254f6df4b95e04d393b8d /cas
parent943bce2c342b7a4177b84e27316d7513f5ee0b98 (diff)
parent11a8a0e1836d4ccac74ffbfa4340081c06aca20c (diff)
downloadplatform-hardware-interfaces-6658796be0ff2b460940e204c5e0b8105989ebb9.tar.gz
platform-hardware-interfaces-6658796be0ff2b460940e204c5e0b8105989ebb9.tar.xz
platform-hardware-interfaces-6658796be0ff2b460940e204c5e0b8105989ebb9.zip
Merge "Reland "Remove conditional vndbinder usage in CAS.""
Diffstat (limited to 'cas')
-rw-r--r--cas/1.0/default/Android.bp6
-rw-r--r--cas/1.0/default/service.cpp2
2 files changed, 0 insertions, 8 deletions
diff --git a/cas/1.0/default/Android.bp b/cas/1.0/default/Android.bp
index 6da5cc44..544162ba 100644
--- a/cas/1.0/default/Android.bp
+++ b/cas/1.0/default/Android.bp
@@ -12,12 +12,6 @@ cc_binary {
12 "TypeConvert.cpp", 12 "TypeConvert.cpp",
13 ], 13 ],
14 14
15 product_variables: {
16 treble: {
17 cflags: ["-DUSE_VNDBINDER"],
18 },
19 },
20
21 compile_multilib: "32", 15 compile_multilib: "32",
22 init_rc: ["android.hardware.cas@1.0-service.rc"], 16 init_rc: ["android.hardware.cas@1.0-service.rc"],
23 17
diff --git a/cas/1.0/default/service.cpp b/cas/1.0/default/service.cpp
index 3f1df5a5..04a8ad97 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;
31int main() { 31int main() {
32 ALOGD("android.hardware.cas@1.0-service starting..."); 32 ALOGD("android.hardware.cas@1.0-service starting...");
33 33
34#ifdef USE_VNDBINDER
35 // The CAS HAL may communicate to other vendor components via 34 // The CAS HAL may communicate to other vendor components via
36 // /dev/vndbinder 35 // /dev/vndbinder
37 android::ProcessState::initWithDriver("/dev/vndbinder"); 36 android::ProcessState::initWithDriver("/dev/vndbinder");
38#endif // USE_VNDBINDER
39 37
40 configureRpcThreadpool(8, true /* callerWillJoin */); 38 configureRpcThreadpool(8, true /* callerWillJoin */);
41 39