summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Buckley <bryan.buckley@ti.com>2012-02-13 12:06:16 -0600
committerMike J. Chen <mjchen@google.com>2012-03-14 16:57:08 -0700
commit626327ec7ab98b40000bd543c9461ff999b32045 (patch)
tree86e26bd9e59e078e5c8e68f221c3fb3f30c9c097
parent78a398145978a077d283f195a4fffabb6d2ac78b (diff)
downloadhardware_ti_omap4-626327ec7ab98b40000bd543c9461ff999b32045.zip
hardware_ti_omap4-626327ec7ab98b40000bd543c9461ff999b32045.tar.gz
hardware_ti_omap4-626327ec7ab98b40000bd543c9461ff999b32045.tar.bz2
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>
-rw-r--r--security/tee_client_api/Android.mk3
-rw-r--r--security/tf_daemon/Android.mk2
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__