From 626327ec7ab98b40000bd543c9461ff999b32045 Mon Sep 17 00:00:00 2001 From: Bryan Buckley <bryan.buckley@ti.com> Date: Mon, 13 Feb 2012 12:06:16 -0600 Subject: DO NOT MERGE Security: fix llog build error for tf_daemon, tee_client_api Choose correct llog by changing LOCAL_LDFLAGS to LOCAL_LDLIBS for llog. Change-Id: Ifc83226f78e64444f0bc28f62ff6d548b463c022 Signed-off-by: Bryan Buckley <bryan.buckley@ti.com> --- security/tee_client_api/Android.mk | 3 ++- security/tf_daemon/Android.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/security/tee_client_api/Android.mk b/security/tee_client_api/Android.mk index e7e0909..8e7d8d5 100644 --- a/security/tee_client_api/Android.mk +++ b/security/tee_client_api/Android.mk @@ -13,8 +13,9 @@ ifdef S_VERSION_BUILD LOCAL_CFLAGS += -DS_VERSION_BUILD=$(S_VERSION_BUILD) endif +LOCAL_LDLIBS += -llog + LOCAL_CFLAGS += -DLINUX -LOCAL_LDFLAGS += -llog LOCAL_CFLAGS += -I $(LOCAL_PATH)/../tf_sdk/include/ LOCAL_MODULE:= libtee_client_api_driver diff --git a/security/tf_daemon/Android.mk b/security/tf_daemon/Android.mk index 8349e6d..dbfbb4a 100644 --- a/security/tf_daemon/Android.mk +++ b/security/tf_daemon/Android.mk @@ -13,7 +13,7 @@ LOCAL_SRC_FILES := \ smc_properties_parser.c \ lib_manifest2.c -LOCAL_LDFLAGS += -llog +LOCAL_LDLIBS += -llog LOCAL_CFLAGS += -DLINUX LOCAL_CFLAGS += -D__ANDROID32__ -- cgit v1.1