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

Commit 19e838ba authored by Jesse Hall's avatar Jesse Hall
Browse files

resolve merge conflicts of 0b546c40 to nyc-dev-plus-aosp 

Change-Id: I76408f38afc40816ae4cc7ef82d1250225d18032
parents 5e6b0dd5 0b546c40

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() {