commit 3756a8350b9f22c78ab195681c262554a7f6e400
author Craig Donner <cdonner@google.com> Tue Jun 14 03:55:26 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 14 03:55:27 2016 +0000
tree 591ab3edd1f559289da355152e901a0cd1f99957
parent 41a67e15ddfe461c5ce16f5af32d46f270b65211
parent 7aa838826c48fe0ec3c4a75e709316c87ce9aea5

Merge "resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp" into nyc-dev-plus-aosp

libs/gui/Android.mk

diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 89a24ca..799b2b5 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -98,12 +98,6 @@
 	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 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() {