commit a8113c12ccb8a47f4756f33aa286ffbb5cfab6fd
author Dmitry Shmidt <dimitrysh@google.com> Wed Aug 21 12:41:51 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 21 12:41:51 2013 -0700
tree d0a8b86908db081961df7ea99d747af62be57371
parent 75860753bc63015af9296a5144c6edf8e99a1ed7
parent 072ca28d7860829083f17d9e24863329010536cf

am 072ca28d: am 56968ec0: Merge "dumpstate: Fix wifi list of networks dump" into klp-dev

* commit '072ca28d7860829083f17d9e24863329010536cf':
  dumpstate: Fix wifi list of networks dump

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"