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

Commit 7212be5f authored by Jeff Hamilton's avatar Jeff Hamilton Committed by Android (Google) Code Review
Browse files

Merge "Use the platform copy of dlext_namespaces.h" into main

parents ff9486ce 9437a791

media/libstagefright/MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <binder/IMemory.h>

#include <binder/IServiceManager.h>

#include <binder/MemoryDealer.h>

#include <bionic/dlext_namespaces.h>

#include <com_android_graphics_libgui_flags.h>

#include <cutils/properties.h>

#include <gui/BufferItem.h>
@@ -89,7 +90,6 @@ 
#include <media/stagefright/PersistentSurface.h>

#include <media/stagefright/RenderedFrameInfo.h>

#include <media/stagefright/SurfaceUtils.h>

#include <nativeloader/dlext_namespaces.h>

#include <private/android_filesystem_config.h>

#include <server_configurable_flags/get_flags.h>

#include <utils/Singleton.h>

media/libstagefright/MediaExtractorFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 
#include <binder/IPCThreadState.h>

#include <binder/PermissionCache.h>

#include <binder/IServiceManager.h>

#include <bionic/dlext_namespaces.h>

#include <media/DataSource.h>

#include <media/stagefright/InterfaceUtils.h>

#include <media/stagefright/MediaExtractor.h>

#include <media/stagefright/MediaExtractorFactory.h>

#include <android/IMediaExtractor.h>

#include <android/IMediaExtractorService.h>

#include <nativeloader/dlext_namespaces.h>

#include <private/android_filesystem_config.h>

#include <cutils/properties.h>

#include <utils/String8.h>