DO NOT MERGE Keep pi-dev-plus-aosp widevine building.

Bug: http://b/111067277 Test: builds Change-Id: If3905c8132c23f2d763792c76da7716a6161eef7
2018-11-30 15:59:49 -08:00
parent 8b97612fb7
commit c0a8e51725
2 changed files with 3 additions and 0 deletions
--- a/libwvdrmengine/cdm/Android.mk
+++ b/libwvdrmengine/cdm/Android.mk
@@ -5,6 +5,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)

 LOCAL_CFLAGS := -DDYNAMIC_ADAPTER
+LOCAL_CPPFLAGS := -std=c++14

 LOCAL_C_INCLUDES := \
    vendor/widevine/libwvdrmengine/cdm/core/include \
--- a/libwvdrmengine/oemcrypto/mock/Android.mk
+++ b/libwvdrmengine/oemcrypto/mock/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH:= $(call my-dir)

 include $(CLEAR_VARS)

+LOCAL_CPPFLAGS := -std=c++14
+
 LOCAL_SRC_FILES:= \
    src/keys.cpp \
    src/oemcrypto_auth_mock.cpp \