From f6346adae0294a30fd71bd38ac4e11a68732af6b Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Wed, 13 Jan 2016 11:48:47 -0800
Subject: [PATCH] Switch to libpng_ndk to remove platform library dependency

Bug: 26513978
Change-Id: I4cb929149264adccdaf3de0f0f57a1e6b64921b5
---
 Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index a769d34..0183bb0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -734,10 +734,12 @@ LOCAL_SHARED_LIBRARIES := \
 		liblog \
 		libm \
 		libc \
-		libpng \
 		libz \
 		libdl
 
+LOCAL_STATIC_LIBRARIES := \
+		libpng_ndk \
+
 LOCAL_CFLAGS += \
 	$(deqp_compile_flags) \
 	-Wno-error=date-time
-- 
2.7.4