Merge "Update unit tests to build into /data/bin" into oc-dev am: b683d2be57 am: fc7e636bdf

am: b13900af37

Change-Id: I46970986c1c1b7188226b2df0a7626aae55762e7
This commit is contained in:
Kyle Alexander
2017-06-14 00:07:21 +00:00
committed by android-build-merger
10 changed files with 106 additions and 75 deletions

View File

@@ -46,7 +46,8 @@ LOCAL_MODULE_TAGS := tests
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
ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
@@ -112,7 +113,8 @@ LOCAL_MODULE_TAGS := tests
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
ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips