summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-05-21 08:55:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-21 08:55:50 -0700
commit7a7d4c25c7362c011397219180c9b7e9afa9ce9c (patch)
tree0715734a54cb6631bf06b37225e7957718945a65
parentfff80172cafb42a06fa952a7412faaabe648f7c3 (diff)
parent4495a87138cd1f0fdf62a9c4649e2c2bdbd3527d (diff)
downloadhardware_ti_omap4xxx-7a7d4c25c7362c011397219180c9b7e9afa9ce9c.zip
hardware_ti_omap4xxx-7a7d4c25c7362c011397219180c9b7e9afa9ce9c.tar.gz
hardware_ti_omap4xxx-7a7d4c25c7362c011397219180c9b7e9afa9ce9c.tar.bz2
am 4495a871: Fix secondary builds (AOSP, panda) - do not merge
* commit '4495a87138cd1f0fdf62a9c4649e2c2bdbd3527d': Fix secondary builds (AOSP, panda) - do not merge
-rw-r--r--libdrmdecrypt/Android.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/libdrmdecrypt/Android.mk b/libdrmdecrypt/Android.mk
index 2f1b644..b584385 100644
--- a/libdrmdecrypt/Android.mk
+++ b/libdrmdecrypt/Android.mk
@@ -9,10 +9,12 @@ LOCAL_C_INCLUDES:= \
$(TOP)/frameworks/native/include/media/hardware \
$(TOP)/vendor/widevine/proprietary/cryptoPlugin \
-LOCAL_STATIC_LIBRARIES := \
- liboemcrypto \
+ifeq ($(BOARD_USES_SECURE_SERVICES),true)
+LOCAL_STATIC_LIBRARIES += \
libtee_client_api_driver \
+endif
+
LOCAL_SHARED_LIBRARIES := \
libstagefright_foundation \
liblog \