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

Commit 4931fb29 authored by Craig Donner's avatar Craig Donner Committed by android-build-merger
Browse files

Merge \"Revert \"GLConsumer: add build-time disable of gpu protected content\"\" into nyc-dev 

am: e1e1e751

Change-Id: Iea28323a8e7bd2333d396b70703ac4b1a99b1911
parents 8fc10c31 e1e1e751

libs/gui/Android.mk

+0 −6
Original line number Original line Diff line number Diff line
@@ -94,12 +94,6 @@ ifeq ($(TARGET_BOARD_PLATFORM), tegra3) 
	LOCAL_CFLAGS += -DDONT_USE_FENCE_SYNC

	LOCAL_CFLAGS += -DDONT_USE_FENCE_SYNC

endif

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)

include $(BUILD_SHARED_LIBRARY)





ifeq (,$(ONE_SHOT_MAKEFILE))

ifeq (,$(ONE_SHOT_MAKEFILE))

libs/gui/GLConsumer.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -135,8 +135,7 @@ static bool hasEglProtectedContentImpl() { 
    bool atEnd = (cropExtLen+1) < extsLen &&

    bool atEnd = (cropExtLen+1) < extsLen &&

            !strcmp(" " PROT_CONTENT_EXT_STR, exts + extsLen - (cropExtLen+1));

            !strcmp(" " PROT_CONTENT_EXT_STR, exts + extsLen - (cropExtLen+1));

    bool inMiddle = strstr(exts, " " PROT_CONTENT_EXT_STR " ");

    bool inMiddle = strstr(exts, " " PROT_CONTENT_EXT_STR " ");

    return ENABLE_GPU_PROTECTED_CONTENT &&

    return equal || atStart || atEnd || inMiddle;

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

}

}





static bool hasEglProtectedContent() {

static bool hasEglProtectedContent() {