From c4aad89fd02233ba6b4cebf8dca87dfc89e7bc41 Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Mon, 20 Mar 2017 11:14:36 -0700 Subject: [PATCH] Rename libhidl_utils to libwidevinehidl_utils. This library is local to vendor/widevine HAL service, rename to indicate this is used only by widevine HAL. Test: Play Movies & TV (streaming and pinned) Test: Netflix bug: 36430909 Change-Id: Iacaf78f4223bf305569e7f1d04dd4e4ad0a87727 --- libwvdrmengine/Android.mk | 8 ++++---- libwvdrmengine/mediacrypto/Android.mk | 2 +- libwvdrmengine/mediacrypto/test/Android.mk | 4 ++-- libwvdrmengine/mediadrm/test/Android.mk | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index 5c5d80a6..54a9352e 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -93,11 +93,11 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ include $(BUILD_STATIC_LIBRARY) # ----------------------------------------------------------------------------- -# Builds libhidl_utils.a +# Builds libwidevinehidl_utils.a # include $(CLEAR_VARS) -LOCAL_MODULE := libhidl_utils +LOCAL_MODULE := libwidevinehidl_utils LOCAL_MODULE_CLASS := STATIC_LIBRARIES @@ -203,9 +203,9 @@ LOCAL_STATIC_LIBRARIES := \ libwvlevel3 \ # When the GNU linker sees a library, it discards all symbols that it doesn't -# need. libhidl_utils must come after both libwvdrmcryptoplugin and +# need. libwidevinehidl_utils must come after both libwvdrmcryptoplugin and # libwvdrmdrmplugin. -LOCAL_STATIC_LIBRARIES += libhidl_utils +LOCAL_STATIC_LIBRARIES += libwidevinehidl_utils LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \ diff --git a/libwvdrmengine/mediacrypto/Android.mk b/libwvdrmengine/mediacrypto/Android.mk index cc7a4c16..beb6c889 100644 --- a/libwvdrmengine/mediacrypto/Android.mk +++ b/libwvdrmengine/mediacrypto/Android.mk @@ -49,7 +49,7 @@ LOCAL_C_INCLUDES := \ LOCAL_STATIC_LIBRARIES := \ libcrypto_static \ - libhidl_utils \ + libwidevinehidl_utils \ LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \ diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index 196a0c94..a8112baa 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -79,8 +79,8 @@ LOCAL_STATIC_LIBRARIES := \ libwvdrmcryptoplugin_hidl \ # When the GNU linker sees a library, it discards all symbols that it doesn't -# need. libhidl_utils must come after libwvdrmcryptoplugin. -LOCAL_STATIC_LIBRARIES += libhidl_utils +# need. libwidevinehidl_utils must come after libwvdrmcryptoplugin. +LOCAL_STATIC_LIBRARIES += libwidevinehidl_utils LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \ diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 32c63962..21195fb1 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -81,8 +81,8 @@ LOCAL_STATIC_LIBRARIES := \ libwvdrmdrmplugin_hidl \ # When the GNU linker sees a library, it discards all symbols that it doesn't -# need. libhidl_utils must come after libwvdrmdrmplugin. -LOCAL_STATIC_LIBRARIES += libhidl_utils +# need. libwidevinehidl_utils must come after libwvdrmdrmplugin. +LOCAL_STATIC_LIBRARIES += libwidevinehidl_utils LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \