resolved conflicts for merge of 256dd1a5 to master

Change-Id: Iffef557a3d9d3df321b5ae38e891d5a2a3e88e70
2015-06-19 19:49:36 -07:00
parent 88c3e74f08 256dd1a5b4
commit 5bd0e73b3e
12 changed files with 12 additions and 12 deletions
--- a/libwvdrmengine/mediadrm/Android.mk
+++ b/libwvdrmengine/mediadrm/Android.mk
@@ -18,6 +18,6 @@ LOCAL_MODULE := libwvdrmdrmplugin

 LOCAL_MODULE_TAGS := optional

-LOCAL_MODULE_TARGET_ARCH := arm x86
+LOCAL_MODULE_TARGET_ARCH := arm x86 mips

 include $(BUILD_STATIC_LIBRARY)
--- a/libwvdrmengine/mediadrm/test/Android.mk
+++ b/libwvdrmengine/mediadrm/test/Android.mk
@@ -42,6 +42,6 @@ LOCAL_MODULE := libwvdrmdrmplugin_test

 LOCAL_MODULE_TAGS := tests

-LOCAL_MODULE_TARGET_ARCH := arm x86
+LOCAL_MODULE_TARGET_ARCH := arm x86 mips

 include $(BUILD_EXECUTABLE)