Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30b71b10 authored by Craig Donner's avatar Craig Donner
Browse files

resolve merge conflicts of 4931fb29 to nyc-mr1-dev-plus-aosp 

Change-Id: I5c46d161af4c4d6b6fcec6705f2d9c7dccc41fc2
parents 30f77870 4931fb29

libs/gui/Android.mk

+0 −6
Original line number Diff line number Diff line
@@ -99,12 +99,6 @@ ifeq ($(TARGET_BOARD_HAS_NO_SURFACE_FLINGER), true) 
	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

+1 −2
Original line number Diff line number Diff line
@@ -135,8 +135,7 @@ static bool hasEglProtectedContentImpl() { 
    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() {