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

Commit b4e22891 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Remove almost-all android::Singleton users"

parents 71b5d299 6b507803

libs/hwui/Caches.cpp

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "ShadowTessellator.h"

#include "utils/GLUtils.h"



#include <cutils/properties.h>

#include <utils/Log.h>

#include <utils/String8.h>

libs/hwui/Caches.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <GLES3/gl3.h>



#include <utils/KeyedVector.h>

#include <utils/Singleton.h>



#include <cutils/compiler.h>

libs/hwui/Extensions.cpp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "Properties.h"

#include "utils/StringUtils.h"



#include <GLES2/gl2.h>

#include <GLES2/gl2ext.h>

#include <utils/Log.h>

libs/hwui/Extensions.h

+0 −6
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ 


#include <cutils/compiler.h>



#include <utils/Singleton.h>

#include <utils/SortedVector.h>

#include <utils/String8.h>



#include <GLES2/gl2.h>



namespace android {

namespace uirenderer {

libs/hwui/GradientCache.cpp

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include "GradientCache.h"

#include "Properties.h"



#include <cutils/properties.h>



namespace android {

namespace uirenderer {