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

Commit 062d0a64 authored by Krzysztof Kosiński's avatar Krzysztof Kosiński Committed by Android (Google) Code Review
Browse files

Revert^2 "Fix headers in Gralloc.h." 

This reverts commit 55d39483.

Reason for revert: CL was reverted due to temporary partial
topic merge weirdness, which should be resolved now.

Bug: 423974626
Test: presubmit
Flag: EXEMPT trivial cleanup
Change-Id: Ie598df646f57c02383a16a3964d07c467f6580fd
parent 55d39483

libs/ui/Gralloc5.cpp

+11 −1
Original line number Diff line number Diff line
@@ -20,14 +20,24 @@ 
#include <ui/Gralloc5.h>



#include <aidl/android/hardware/graphics/allocator/AllocationError.h>

#include <aidl/android/hardware/graphics/allocator/BufferDescriptorInfo.h>

#include <aidl/android/hardware/graphics/common/StandardMetadataType.h>

#include <aidlcommonsupport/NativeHandle.h>

#include <android/binder_manager.h>

#include <android/hardware/graphics/mapper/IMapper.h>

#include <android/hardware/graphics/mapper/utils/IMapperMetadataTypes.h>

#include <binder/IPCThreadState.h>

#include <dlfcn.h>

#include <gralloctypes/Gralloc4.h>

#include <ui/FatVector.h>

#include <ui/GraphicTypes.h>

#include <vndksupport/linker.h>



#include <cstdint>

#include <memory>

#include <sstream>

#include <string>

#include <vector>



using namespace aidl::android::hardware::graphics::allocator;

using namespace aidl::android::hardware::graphics::common;

using namespace ::android::hardware::graphics::mapper;

libs/ui/include/ui/Gralloc.h

+6 −3
Original line number Diff line number Diff line
@@ -17,15 +17,18 @@ 
#ifndef ANDROID_UI_GRALLOC_H

#define ANDROID_UI_GRALLOC_H



#include <gralloctypes/Gralloc4.h>

#include <hidl/HidlSupport.h>

#include <cutils/native_handle.h>

#include <system/graphics.h>

#include <ui/GraphicTypes.h>

#include <ui/PixelFormat.h>

#include <ui/Rect.h>

#include <utils/StrongPointer.h>

#include <utils/Errors.h>

#include "GraphicBufferAllocator.h"



#include <cstdint>

#include <optional>

#include <string>

#include <vector>



namespace android {