commit 8b0d55e3652e68e9e2b0f4314c1eaeadc49cc2d0
author Jesse Hall <jessehall@google.com> Thu Mar 31 19:29:36 2016 -0700
committer Jesse Hall <jessehall@google.com> Thu Mar 31 22:24:06 2016 -0700
tree b5f5508bb65870284509b50fa78923d3921f84ad
parent fc038bd8fc77998a436d43027919f4500c4291e6

GpuService: Add 'help' and 'vkjson' commands

Bug: 26620936 and 27352427
Change-Id: Id0ad5b7184ddc624eddfb292a0d86546c26fb9ea

services/surfaceflinger/Android.mk

diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 1595bdf..fb6307e 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -38,6 +38,9 @@
     RenderEngine/GLES11RenderEngine.cpp \
     RenderEngine/GLES20RenderEngine.cpp
 
+LOCAL_C_INCLUDES := \
+	frameworks/native/vulkan/include \
+	external/vulkan-validation-layers/libs/vkjson
 
 LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
 LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
@@ -107,6 +110,7 @@
 LOCAL_CFLAGS += -fvisibility=hidden -Werror=format
 LOCAL_CFLAGS += -std=c++14
 
+LOCAL_STATIC_LIBRARIES := libvkjson
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
     liblog \
@@ -119,7 +123,8 @@
     libbinder \
     libui \
     libgui \
-    libpowermanager
+    libpowermanager \
+    libvulkan
 
 LOCAL_MODULE := libsurfaceflinger