From: Edwin Wong <edwinwong@google.com>
Date: Tue, 1 Jul 2014 15:43:12 +0000 (-0700)
Subject: Fix build target path.
X-Git-Tag: android-x86-6.0-r1~1952
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2421a4ba309f082a83be9b8e385c00cd8e0043f6;p=android-x86%2Fframeworks-av.git

Fix build target path.

Change-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e
---

diff --git a/drm/mediadrm/plugins/clearkey/Android.mk b/drm/mediadrm/plugins/clearkey/Android.mk
index 716b945a9e..22a85b4cf8 100644
--- a/drm/mediadrm/plugins/clearkey/Android.mk
+++ b/drm/mediadrm/plugins/clearkey/Android.mk
@@ -40,7 +40,8 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE := libdrmclearkeyplugin
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/mediadrm
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := mediadrm
 
 LOCAL_SHARED_LIBRARIES := \
     libcrypto \
diff --git a/drm/mediadrm/plugins/clearkey/tests/unit-test.mk b/drm/mediadrm/plugins/clearkey/tests/unit-test.mk
index 7504f34e75..e33ea527a6 100644
--- a/drm/mediadrm/plugins/clearkey/tests/unit-test.mk
+++ b/drm/mediadrm/plugins/clearkey/tests/unit-test.mk
@@ -49,4 +49,4 @@ LOCAL_SHARED_LIBRARIES := \
     libstlport \
     libutils \
 
-include $(BUILD_EXECUTABLE)
+include $(BUILD_NATIVE_TEST)