include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(C_SOURCES)
+LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
-LOCAL_CFLAGS := -std=c99
-
-LOCAL_C_INCLUDES :=
+LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common \
+ external/libcxx/include
+LOCAL_STATIC_LIBRARIES := libmesa_amd_common
+LOCAL_SHARED_LIBRARIES := libdrm_radeon
LOCAL_MODULE := libmesa_pipe_r600
include $(GALLIUM_COMMON_MK)