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

Commit 770184a6 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' of git@github.com:cyanogen/android_frameworks_base into eclair

parents 3b42c83e d085809f

libs/rs/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ LOCAL_SRC_FILES:= \ 
	rsType.cpp \

	rsVertexArray.cpp



ifdef BOARD_NO_GL2

	LOCAL_CFLAGS += -DBOARD_NO_GL2

endif



LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libGLESv2 libui libacc

LOCAL_LDLIBS := -lpthread -ldl

libs/rs/rsContext.cpp

+4 −0
Original line number Diff line number Diff line
@@ -477,7 +477,11 @@ void Context::setSurface(uint32_t w, uint32_t h, Surface *sur) 
        if (!mEGL.mContext) {

            first = true;

            pthread_mutex_lock(&gInitMutex);

#ifdef BOARD_NO_GL2

            initEGL(false);

#else

            initEGL(true);

#endif

            pthread_mutex_unlock(&gInitMutex);

        }