add support for gralloc1 mapper

[android-x86/external-swiftshader.git] / src / OpenGL / libEGL / Android.mk

diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index 99ab80f..8026c7b 100644 (file)
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -19,7 +19,7 @@ endif
 COMMON_SRC_FILES := \
        Config.cpp \
        Display.cpp \
-       EGLSurface.cpp \
+       Surface.cpp \
        libEGL.cpp \
        main.cpp
 
@@ -29,15 +29,18 @@ COMMON_C_INCLUDES := \
        $(LOCAL_PATH)/../ \
        $(LOCAL_PATH)/../../
 
-COMMON_STATIC_LIBRARIES := \
-       libLLVM_swiftshader
-
 COMMON_SHARED_LIBRARIES := \
        libdl \
        liblog \
        libcutils \
        libhardware
 
+# gralloc1 is introduced from N MR1
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25 && echo NMR1),NMR1)
+COMMON_CFLAGS += -DHAVE_GRALLOC1
+COMMON_SHARED_LIBRARIES += libsync
+endif
+
 # Marshmallow does not have stlport, but comes with libc++ by default
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
 COMMON_SHARED_LIBRARIES += libstlport