commit 4931fb298e076212981b2acae6752743d7340f02
author Craig Donner <cdonner@google.com> Mon Jun 13 23:25:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 13 23:25:23 2016 +0000
tree 00e8f3e2789a1ac9df388752a4aa930a5ec6e0da
parent 8fc10c310ec3fe66d68ea2a90702ee31b329750a
parent e1e1e75173d557466e824782c61802a8415c7073

Merge \"Revert \"GLConsumer: add build-time disable of gpu protected content\"\" into nyc-dev
am: e1e1e75173

Change-Id: Iea28323a8e7bd2333d396b70703ac4b1a99b1911

libs/gui/Android.mk

diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 3e30bb2..46feb1c 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -94,12 +94,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 a06c7b5..553b65c 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() {