670993262f
This project is still using stlport (without telling the build system
about it), which was causing (broken) stlport headers to override
libc++ headers, leading to a broken copy of std::enable_if, which in
turn caused <atomic> to fail to compile. Since this project has
prebuilts that will need to be updated before this project can
actually move away from stlport, tell the build system that it is
still using stlport for now.
Bug: 18433002
Change-Id: I38b356428977ed2184eb28a07bd5e7424a4ace8d
(cherry picked from commit de4bc34719)
51 lines
1.2 KiB
Makefile
51 lines
1.2 KiB
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
########################
|
|
# Feature file for clients to look up widevine drm plug-in
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := com.google.widevine.software.drm.xml
|
|
LOCAL_SRC_FILES := $(LOCAL_MODULE)
|
|
LOCAL_MODULE_TAGS := optional
|
|
LOCAL_MODULE_OWNER := widevine
|
|
LOCAL_MODULE_CLASS := ETC
|
|
|
|
# This will install the file in /system/etc/permissions
|
|
#
|
|
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
|
|
|
|
include $(BUILD_PREBUILT)
|
|
|
|
########################
|
|
# Dummy library used to indicate availability of widevine drm
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := com.google.widevine.software.drm
|
|
LOCAL_SRC_FILES := src/StubLib.java
|
|
LOCAL_MODULE_TAGS := optional
|
|
LOCAL_MODULE_OWNER := widevine
|
|
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
|
|
|
|
include $(BUILD_JAVA_LIBRARY)
|
|
|
|
########################
|
|
|
|
include $(CLEAR_VARS)
|
|
include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/common.mk
|
|
|
|
LOCAL_SRC_FILES:= \
|
|
src/WVMDrmPlugin.cpp \
|
|
src/WVMLogging.cpp
|
|
|
|
LOCAL_MODULE := libdrmwvmcommon
|
|
LOCAL_MODULE_TAGS := optional
|
|
|
|
LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
|
|
|
|
LOCAL_CXX_STL := stlport
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
# invoke Android.mk files in subdirs
|
|
include $(call all-makefiles-under,$(LOCAL_PATH))
|