From 4495a87138cd1f0fdf62a9c4649e2c2bdbd3527d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Wed, 2 May 2012 18:02:39 -0700 Subject: Fix secondary builds (AOSP, panda) - do not merge liboemcrypto only exists in vendor/ builds BOARD_USES_SECURE_SERVICES isn't set in all builds Bug: 6521860 Change-Id: Ied82b1f8dc177feb710e8d9b0abd42fbfac4d9f9 --- libdrmdecrypt/Android.mk | 6 ++++-- 1 file 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 \ -- cgit v1.1