(This contains a merge of http://go/wvgerrit/13382 from the Widevine repository.) This undoes the previous change to silence harmless C++11 narrowing warnings and instead changes the code to no longer trigger them. The fix was to delcare the type of our PSSH prefix constant to be uint8_t* and then convert it to char* at usage-time rather than defining the not-technically-char* data as a char* to start. Change-Id: I68ff8c3ed0859096863b49c61cd60ae8461b5b29
24 lines
596 B
Makefile
24 lines
596 B
Makefile
LOCAL_PATH := $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := \
|
|
src/WVDrmPlugin.cpp \
|
|
src/WVGenericCryptoInterface.cpp \
|
|
|
|
LOCAL_C_INCLUDES := \
|
|
frameworks/av/include \
|
|
frameworks/native/include \
|
|
vendor/widevine/libwvdrmengine/cdm/core/include \
|
|
vendor/widevine/libwvdrmengine/cdm/include \
|
|
vendor/widevine/libwvdrmengine/include \
|
|
vendor/widevine/libwvdrmengine/mediadrm/include \
|
|
vendor/widevine/libwvdrmengine/oemcrypto/include \
|
|
|
|
LOCAL_MODULE := libwvdrmdrmplugin
|
|
|
|
LOCAL_MODULE_TAGS := optional
|
|
|
|
LOCAL_MODULE_TARGET_ARCH := arm x86
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|