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

Commit eb26471c authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am dff2f699: am 39c24a20: fix local include paths 

* commit 'dff2f699':
  fix local include paths
parents 0434eead dff2f699

opengl/libs/EGL/Loader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 


#include <EGL/egl.h>



#include "../glestrace.h"



#include "egldefs.h"

#include "glestrace.h"

#include "hooks.h"

#include "Loader.h"



// ----------------------------------------------------------------------------

opengl/libs/EGL/egl.cpp

+5 −5
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ 
#include <utils/CallStack.h>

#include <utils/String8.h>



#include "egldefs.h"

#include "egl_impl.h"

#include "../egl_impl.h"

#include "../glestrace.h"



#include "egl_tls.h"

#include "glestrace.h"

#include "hooks.h"

#include "egldefs.h"

#include "Loader.h"



#include "egl_display.h"
@@ -387,7 +387,7 @@ gl_hooks_t const* getGlThreadSpecific() { 
#define EGL_ENTRY(_r, _api, ...) #_api,



char const * const gl_names[] = {

    #include "entries.in"

    #include "../entries.in"

    NULL

};

opengl/libs/EGL/eglApi.cpp

+3 −5
Original line number Diff line number Diff line
@@ -37,13 +37,11 @@ 
#include <utils/String8.h>

#include <utils/Trace.h>



#include "egl_impl.h"

#include "egl_tls.h"

#include "glestrace.h"

#include "hooks.h"

#include "../egl_impl.h"

#include "../glestrace.h"

#include "../hooks.h"



#include "egl_display.h"

#include "egl_impl.h"

#include "egl_object.h"

#include "egl_tls.h"

#include "egldefs.h"

opengl/libs/EGL/egl_cache.cpp

+2 −1
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ 
 ** limitations under the License.

 */



#include "../egl_impl.h"



#include "egl_cache.h"

#include "egl_display.h"

#include "egl_impl.h"

#include "egldefs.h"



#include <fcntl.h>

opengl/libs/EGL/egl_display.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,11 +18,12 @@ 


#include <string.h>



#include "../egl_impl.h"



#include "egl_cache.h"

#include "egl_display.h"

#include "egl_object.h"

#include "egl_tls.h"

#include "egl_impl.h"

#include "Loader.h"

#include <cutils/properties.h>