Revert "Merge Android R"

[android-x86/external-minigbm.git] / cros_gralloc / Makefile

diff --git a/cros_gralloc/Makefile b/cros_gralloc/Makefile
index 9e1be9e..c95ad2c 100644 (file)
--- a/cros_gralloc/Makefile
+++ b/cros_gralloc/Makefile
@@ -6,6 +6,9 @@ GRALLOC = gralloc.cros.so
 
 SRCS    = $(wildcard *.cc)
 SRCS   += $(wildcard ../*.c)
+
+SRCS   += $(wildcard gralloc0/*.cc)
+
 SOURCES = $(filter-out ../gbm%, $(SRCS))
 PKG_CONFIG ?= pkg-config
 
@@ -13,10 +16,10 @@ VPATH = $(dir $(SOURCES))
 LIBDRM_CFLAGS := $(shell $(PKG_CONFIG) --cflags libdrm)
 LIBDRM_LIBS := $(shell $(PKG_CONFIG) --libs libdrm)
 
-CPPFLAGS += -Wall -fPIC -Werror -flto $(LIBDRM_CFLAGS)
-CXXFLAGS += -std=c++11
-CFLAGS   += -std=c99
-LIBS     += -shared -lcutils -lhardware $(LIBDRM_LIBS)
+CPPFLAGS += -Wall -fPIC -Werror -flto $(LIBDRM_CFLAGS) -D_GNU_SOURCE=1
+CXXFLAGS += -std=c++14
+CFLAGS   += -std=c99 -D_GNU_SOURCE=1
+LIBS     += -shared -lcutils -lhardware -lsync $(LIBDRM_LIBS)
 
 OBJS =  $(foreach source, $(SOURCES), $(addsuffix .o, $(basename $(source))))