commit 75860753bc63015af9296a5144c6edf8e99a1ed7
author Mathias Agopian <mathias@google.com> Wed Aug 21 11:59:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 21 11:59:15 2013 -0700
tree 3454c5e63815684742bcaaed2ffb79da1621b8b4
parent 68df058934de64a03cf431ff84318e15e4ed0bfe
parent b383438b97643060e7ff5e737f0439418bd0ce3e

am b383438b: am a525483d: Merge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev

* commit 'b383438b97643060e7ff5e737f0439418bd0ce3e':
  Fix a bug where non-cropped layer could be scaled incorrectly

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"