summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Wong <edwinwong@google.com>2014-07-01 08:43:12 -0700
committerEdwin Wong <edwinwong@google.com>2014-07-01 09:27:33 -0700
commit2421a4ba309f082a83be9b8e385c00cd8e0043f6 (patch)
treeef335b48b2340c17f880a79e98cf273103b4c39d
parent8d0bc4a8ea2a5d0d6aba036f15b185d60e18778f (diff)
downloadframeworks_av-2421a4ba309f082a83be9b8e385c00cd8e0043f6.zip
frameworks_av-2421a4ba309f082a83be9b8e385c00cd8e0043f6.tar.gz
frameworks_av-2421a4ba309f082a83be9b8e385c00cd8e0043f6.tar.bz2
Fix build target path.
Change-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e
-rw-r--r--drm/mediadrm/plugins/clearkey/Android.mk3
-rw-r--r--drm/mediadrm/plugins/clearkey/tests/unit-test.mk2
2 files changed, 3 insertions, 2 deletions
diff --git a/drm/mediadrm/plugins/clearkey/Android.mk b/drm/mediadrm/plugins/clearkey/Android.mk
index 716b945..22a85b4 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 7504f34..e33ea52 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)