From 80ec93754566ea6b5c4f6a300ee833a24196c7b8 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 1 May 2017 11:25:23 -0700 Subject: [PATCH] Remove redundant dependencies android.hidl.base@1.0 and android.hidlmanager@1.0 are built into libhidltransport. Test: links Bug: 33276472 Change-Id: Id9053e4484275e3404f31a72d2037884ff6bef5b --- libwvdrmengine/Android.mk | 3 +-- libwvdrmengine/mediacrypto/test/Android.mk | 2 +- libwvdrmengine/mediadrm/test/Android.mk | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index 2dbd7e71..f689ec44 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -17,7 +17,6 @@ LOCAL_C_INCLUDES := \ LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \ - android.hidl.base@1.0 \ libbase \ libhidltransport \ libhwbinder \ @@ -212,12 +211,12 @@ LOCAL_STATIC_LIBRARIES += libwidevinehidl_utils LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \ - android.hidl.base@1.0 \ android.hidl.memory@1.0 \ libcutils \ libdl \ libhidlbase \ libhidlmemory \ + libhidltransport \ libhwbinder \ liblog \ libprotobuf-cpp-lite \ diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index 2ed07a3f..05ccf808 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -91,13 +91,13 @@ LOCAL_STATIC_LIBRARIES += libwidevinehidl_utils LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \ - android.hidl.base@1.0 \ android.hidl.memory@1.0 \ libbinder \ libcutils \ libdl \ libhidlbase \ libhidlmemory \ + libhidltransport \ liblog \ libprotobuf-cpp-lite \ libutils \ diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index a04a4281..108e9041 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -92,13 +92,13 @@ LOCAL_STATIC_LIBRARIES += libwidevinehidl_utils LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \ - android.hidl.base@1.0 \ android.hidl.memory@1.0 \ libbinder \ libcutils \ libdl \ libhidlbase \ libhidlmemory \ + libhidltransport \ liblog \ libprotobuf-cpp-lite \ libutils \