commit 5695ff4eea3bb99f41ba4942d3ab4622f6c0f5d7
author Jesse Hall <jessehall@google.com> Wed May 04 11:57:59 2016 -0700
committer Jesse Hall <jessehall@google.com> Wed May 04 11:57:59 2016 -0700
tree 1d3106681f88d0018c2e7a8cd1623a432b35674d
parent 99438f59cb95616167dd90fd220191958093aed6
parent f1d0fda80c75391be36f8577f1cd888650ebb2ac

resolve merge conflicts of f1d0fda to nyc-mr1-dev-plus-aosp

Change-Id: Idc687824aae05ad41d3ffc8f696f98351d306f8d

libs/gui/Android.mk

diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 799b2b5..89a24ca 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -98,6 +98,12 @@
 	LOCAL_CFLAGS += -DHAVE_NO_SURFACE_FLINGER
 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 ac8bc6e..7a1ad46 100644
--- a/libs/gui/GLConsumer.cpp
+++ b/libs/gui/GLConsumer.cpp
@@ -135,7 +135,8 @@
     bool atEnd = (cropExtLen+1) < extsLen &&
             !strcmp(" " PROT_CONTENT_EXT_STR, exts + extsLen - (cropExtLen+1));
     bool inMiddle = strstr(exts, " " PROT_CONTENT_EXT_STR " ");
-    return equal || atStart || atEnd || inMiddle;
+    return ENABLE_GPU_PROTECTED_CONTENT &&
+            (equal || atStart || atEnd || inMiddle);
 }
 
 static bool hasEglProtectedContent() {