commit 05f0a81a93f0d41fa4115c752e617849d145fe5b
author John Reck <jreck@android.com> Tue Aug 27 16:49:46 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 27 16:49:46 2013 +0000
tree 6417173e60491f671f082e1716c203fbdbc13f75
parent fc43e16a5693bca0edfc82c650fb606971e47138
parent e9b2dfe3fd31c1a099b954145389b66bd5d556bf

Merge "Add libpng include path"

cmds/screenshot/Android.mk

diff --git a/cmds/screenshot/Android.mk b/cmds/screenshot/Android.mk
index 0afb2c5..1ee7807 100644
--- a/cmds/screenshot/Android.mk
+++ b/cmds/screenshot/Android.mk
@@ -7,6 +7,6 @@
 
 LOCAL_SHARED_LIBRARIES := libcutils libz liblog
 LOCAL_STATIC_LIBRARIES := libpng
-LOCAL_C_INCLUDES += external/zlib
+LOCAL_C_INCLUDES += external/zlib external/libpng
 
 include $(BUILD_EXECUTABLE)

cmds/screenshot/screenshot.c

diff --git a/cmds/screenshot/screenshot.c b/cmds/screenshot/screenshot.c
index cca80c3..be1ecd4 100644
--- a/cmds/screenshot/screenshot.c
+++ b/cmds/screenshot/screenshot.c
@@ -8,7 +8,7 @@
 #include <linux/fb.h>
 
 #include <zlib.h>
-#include <libpng/png.h>
+#include <png.h>
 
 #include "private/android_filesystem_config.h"