commit 5486f8ade279bcf0e15f68e7de39ce4072f85659
author Steven Moreland <smoreland@google.com> Fri Dec 08 19:33:06 2017 +0000
committer Steven Moreland <smoreland@google.com> Fri Dec 08 19:40:16 2017 +0000
tree 304742b85ca8c1f6aa537c388af0781dfd934801
parent 3a84fd689da769358b2025ce5632f237be681892

Revert "Remove conditional vndbinder usage in OMX."

This reverts commit 3a84fd689da769358b2025ce5632f237be681892.

Bug: 70393284
Reason for revert: Fugu doesn't have vndbinder
Exempt-From-Owner-Approval: Device doesn't boot.
Change-Id: I50484019606a1d14ce31fa18f2e52b1dce1b0fa7

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);