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

Commit d8b4329e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13851688 from 8fb605fa to 25Q4-release 

Change-Id: Ie660a336022f43e1f7a30ac9afc81d3f28d396f4
parents 9b5d5941 8fb605fa

libs/binder/Parcel.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2024,6 +2024,7 @@ status_t Parcel::validateReadData(size_t upperBound) const 
{

    const auto* kernelFields = maybeKernelFields();

    if (kernelFields == nullptr) {

        if (upperBound == 0) return OK;

        auto* rpcFields = maybeRpcFields();

        LOG_ALWAYS_FATAL_IF(rpcFields == nullptr);

        if (rpcFields->mObjectPositions.empty()) return OK;

libs/renderengine/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ package { 
cc_defaults {

    name: "renderengine_defaults",

    cflags: [

        "-DLOG_TAG=\"RenderEngine\"",

        "-DLOG_TAG=\"SurfaceFlinger\"",

        "-Wall",

        "-Werror",

        "-Wthread-safety",

libs/renderengine/benchmark/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ cc_benchmark { 
        "libshaders",

        "libtonemap",

    ],

    cflags: [

        "-DLOG_TAG=\"RenderEngineBench\"",

    ],



    shared_libs: [

        "libbase",

        "libcutils",

libs/renderengine/skia/AutoBackendTexture.cpp

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


#include "AutoBackendTexture.h"



#undef LOG_TAG

#define LOG_TAG "RenderEngine"

#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include <include/core/SkImage.h>

libs/renderengine/skia/GaneshVkRenderEngine.cpp

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


#include "GaneshVkRenderEngine.h"



#undef LOG_TAG

#define LOG_TAG "RenderEngine"



#include "ShaderCache.h"



#include <include/gpu/ganesh/vk/GrVkBackendSemaphore.h>