commit 316c3176b8b839a8465d0c0dfa3878a14d3454c0
author Steven Moreland <smoreland@google.com> Fri Dec 08 19:40:47 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 08 19:40:47 2017 +0000
tree 3284e34559f1e1069f9d1b56f14ddbe26140e2db
parent 22f920a8a520614d872024400bf0e371c77dcc7e
parent 5486f8ade279bcf0e15f68e7de39ce4072f85659

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

services/mediacodec/Android.mk

diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index caa0703..9348ecd 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -26,6 +26,10 @@
 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 701ca6e..6f14a42 100644
--- a/services/mediacodec/main_codecservice.cpp
+++ b/services/mediacodec/main_codecservice.cpp
@@ -40,8 +40,10 @@
     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);