aboutsummaryrefslogtreecommitdiff
path: root/ta
diff options
context:
space:
mode:
authorJens Wiklander <jens.wiklander@linaro.org>2016-03-27 17:38:49 +0200
committerJens Wiklander <jens.wiklander@linaro.org>2016-05-09 08:16:20 +0200
commitca3a35827698ad5d715c5bacb6d59f035bf9d042 (patch)
treec630caac177aff20a9914cbc34112b699568fc45 /ta
parent1a490fe78aa57c04afcc2dc2ee6fcbcb8294ce0f (diff)
Import zlib-1.2.8
Imports zlib-1.2.8 from http://zlib.net/zlib-1.2.8.tar.xz with MD5 checksum 28f1205d8dd2001f26fec1e8c2cebe37 This library is built as a user-mode lib only and is needed to be able to decompress 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 2bada9c8..7537ae4a 100644
--- a/ta/mk/ta_dev_kit.mk
+++ b/ta/mk/ta_dev_kit.mk
@@ -50,10 +50,11 @@ endif
cppflags$(sm) += -I. -I$(ta-dev-kit-dir)/include
libdirs += $(ta-dev-kit-dir)/lib
-libnames += utils utee mpa utils utee
+libnames += utils utee mpa utils zlib 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
.PHONY: clean
clean:
diff --git a/ta/ta.mk b/ta/ta.mk
index a66bd62a..004a01e5 100644
--- a/ta/ta.mk
+++ b/ta/ta.mk
@@ -28,6 +28,10 @@ libname = utils
libdir = lib/libutils
include mk/lib.mk
+libname = zlib
+libdir = lib/libzlib
+include mk/lib.mk
+
libname = mpa
libdir = lib/libmpa
include mk/lib.mk