Merge "Build widevine tests with BOARD_VNDK_VERSION set" into oc-mr1-dev

libwvdrmengine/cdm/test/unit-test.mk

@@ -42,7 +42,7 @@ LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libdl \
     liblog \
-    libmedia \
+    libmedia_omx \
     libprotobuf-cpp-lite \
     libssl \
     libstagefright_foundation \
@@ -51,6 +51,7 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_CFLAGS += -DUNIT_TEST
 
 LOCAL_MODULE_OWNER := widevine
+LOCAL_PROPRIETARY_MODULE := true
 
 # When built, explicitly put it in the DATA/bin directory.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin