commit 4df76b2f5f7e8be128b5ec7a2d8d03845effaea0
author Craig Donner <cdonner@google.com> Mon Jun 13 22:14:15 2016 +0000
committer Craig Donner <cdonner@google.com> Mon Jun 13 22:29:17 2016 +0000
tree c96f28d6063a70945587a57c935bf1523252a8a8
parent dea97b7aa2b5cfbb7d42f30bcbf86a01778b609b

Revert "GLConsumer: add build-time disable of gpu protected content"

This reverts commit dea97b7aa2b5cfbb7d42f30bcbf86a01778b609b.

Bug: 28545166

Change-Id: I4b069e14c2b99e190ebdea6df1ed83827ffe17b6

libs/gui/Android.mk

diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 6e92a47..635020e 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -93,12 +93,6 @@
 	LOCAL_CFLAGS += -DDONT_USE_FENCE_SYNC
 endif
 
-ifeq ($(BOARD_ENABLE_GPU_PROTECTED_CONTENT),true)
-	LOCAL_CFLAGS += -DENABLE_GPU_PROTECTED_CONTENT=true
-else
-	LOCAL_CFLAGS += -DENABLE_GPU_PROTECTED_CONTENT=false
-endif
-
 include $(BUILD_SHARED_LIBRARY)
 
 ifeq (,$(ONE_SHOT_MAKEFILE))

libs/gui/GLConsumer.cpp

diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp
index 7a1ad46..ac8bc6e 100644
--- a/libs/gui/GLConsumer.cpp
+++ b/libs/gui/GLConsumer.cpp
@@ -135,8 +135,7 @@
     bool atEnd = (cropExtLen+1) < extsLen &&
             !strcmp(" " PROT_CONTENT_EXT_STR, exts + extsLen - (cropExtLen+1));
     bool inMiddle = strstr(exts, " " PROT_CONTENT_EXT_STR " ");
-    return ENABLE_GPU_PROTECTED_CONTENT &&
-            (equal || atStart || atEnd || inMiddle);
+    return equal || atStart || atEnd || inMiddle;
 }
 
 static bool hasEglProtectedContent() {