commit d5de81458b829504237b8e044adb3808e96ebe10
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 14 04:01:12 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 14 04:01:12 2017 +0000
tree a91a6009a4d4b9a2335d460ee8d1186208ce25d2
parent 4f5acf877822555415d7cac66f149677abf77e41
parent c880baf8eeb521f6be8bc4720bb227eeb05d635a

Merge "Reland "Remove conditional vndbinder usage in OMX.""

services/mediacodec/Android.mk

diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index 120a717..ca31691 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -25,10 +25,6 @@
 LOCAL_32_BIT_ONLY := true
 LOCAL_INIT_RC := android.hardware.media.omx@1.0-service.rc
 
-ifeq ($(PRODUCT_FULL_TREBLE),true)
-LOCAL_CFLAGS += -DUSE_VNDBINDER
-endif
-
 include $(BUILD_EXECUTABLE)
 
 # service seccomp policy

services/mediacodec/main_codecservice.cpp

diff --git a/services/mediacodec/main_codecservice.cpp b/services/mediacodec/main_codecservice.cpp
index 6f14a42..701ca6e 100644
--- a/services/mediacodec/main_codecservice.cpp
+++ b/services/mediacodec/main_codecservice.cpp
@@ -40,10 +40,8 @@
     signal(SIGPIPE, SIG_IGN);
     SetUpMinijail(kSystemSeccompPolicyPath, kVendorSeccompPolicyPath);
 
-#ifdef USE_VNDBINDER
     android::ProcessState::initWithDriver("/dev/vndbinder");
     android::ProcessState::self()->startThreadPool();
-#endif // USE_VNDBINDER
 
     ::android::hardware::configureRpcThreadpool(64, false);