aboutsummaryrefslogtreecommitdiff
path: root/ta
diff options
context:
space:
mode:
authorJens Wiklander <jens.wiklander@linaro.org>2016-03-27 15:24:43 +0200
committerJens Wiklander <jens.wiklander@linaro.org>2016-05-11 13:50:11 +0200
commitfdf35d01c3803c71e7cfb167be31c7a8e370b5a0 (patch)
tree97805e7f3d28b1475a2cb2fae18c445846977a4d /ta
parentb44708c1c842a9e1ebb63c7f6b43774795669c7a (diff)
Import libpng 1.6.21
Imports libpng 1.6.21 from git://git.code.sf.net/p/libpng/code, tag ibpng-1.6.21-master-signed This library is built as a user-mode lib only and is needed to be able to support png images used in Trusted UI. Internal test files and other unused files are removed. Reviewed-by: Pascal Brand <pascal.brand@linaro.org> Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU) Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'ta')
-rw-r--r--ta/mk/ta_dev_kit.mk3
-rw-r--r--ta/ta.mk4
2 files changed, 6 insertions, 1 deletions
diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk
index 7537ae4a..045878d4 100644
--- a/ta/mk/ta_dev_kit.mk
+++ b/ta/mk/ta_dev_kit.mk
@@ -50,11 +50,12 @@ endif
cppflags$(sm) += -I. -I$(ta-dev-kit-dir)/include
libdirs += $(ta-dev-kit-dir)/lib
-libnames += utils utee mpa utils zlib utee
+libnames += utils utee mpa utils zlib png utee
libdeps += $(ta-dev-kit-dir)/lib/libutils.a
libdeps += $(ta-dev-kit-dir)/lib/libmpa.a
libdeps += $(ta-dev-kit-dir)/lib/libutee.a
libdeps += $(ta-dev-kit-dir)/lib/libzlib.a
+libdeps += $(ta-dev-kit-dir)/lib/libpng.a
.PHONY: clean
clean:
diff --git a/ta/ta.mk b/ta/ta.mk
index 004a01e5..eb1d0ea7 100644
--- a/ta/ta.mk
+++ b/ta/ta.mk
@@ -32,6 +32,10 @@ libname = zlib
libdir = lib/libzlib
include mk/lib.mk
+libname = png
+libdir = lib/libpng
+include mk/lib.mk
+
libname = mpa
libdir = lib/libmpa
include mk/lib.mk