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

Commit 5695ff4e authored by Jesse Hall's avatar Jesse Hall
Browse files

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

Change-Id: Idc687824aae05ad41d3ffc8f696f98351d306f8d
parents 99438f59 f1d0fda8

libs/gui/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,12 @@ 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

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ 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 equal || atStart || atEnd || inMiddle;

    return ENABLE_GPU_PROTECTED_CONTENT &&

            (equal || atStart || atEnd || inMiddle);

}



static bool hasEglProtectedContent() {