widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc

Browse Source 
Change-Id: I40ec39f7a6d9620bcd9af41a3aab4691e95ab582
This commit is contained in:
Automerger Merge Worker
2020-03-09 21:42:35 +00:00
parent 20745a3aca cbfb68abdc
commit 6889037bb3
3 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/Android.mk
View File

@@ -168,7 +168,6 @@ LOCAL_STATIC_LIBRARIES := \
libwvdrmcryptoplugin \ libwvdrmcryptoplugin \
libwvdrmdrmplugin \ libwvdrmdrmplugin \
libwvlevel3 \ libwvlevel3 \
libwv_odk \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libbase \ libbase \
@@ -230,7 +229,6 @@ LOCAL_STATIC_LIBRARIES := \
libwvdrmcryptoplugin_hidl \ libwvdrmcryptoplugin_hidl \
libwvdrmdrmplugin_hidl \ libwvdrmdrmplugin_hidl \
libwvlevel3 \ libwvlevel3 \
libwv_odk \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
android.hardware.drm@1.0 \ android.hardware.drm@1.0 \

1
libwvdrmengine/cdm/Android.bp
View File

@@ -17,7 +17,6 @@ cc_library_static {
"vendor/widevine/libwvdrmengine/cdm/util/include", "vendor/widevine/libwvdrmengine/cdm/util/include",
"vendor/widevine/libwvdrmengine/cdm/include", "vendor/widevine/libwvdrmengine/cdm/include",
"vendor/widevine/libwvdrmengine/oemcrypto/include", "vendor/widevine/libwvdrmengine/oemcrypto/include",
"vendor/widevine/libwvdrmengine/oemcrypto/odk/include",
"external/jsmn", "external/jsmn",
"external/protobuf/src", "external/protobuf/src",
], ],

1
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -33,7 +33,6 @@
#include "license_protocol.pb.h" #include "license_protocol.pb.h"
#include "log.h" #include "log.h"
#include "metrics_collections.h" #include "metrics_collections.h"
#include "odk.h"
#include "properties.h" #include "properties.h"
#include "wv_cdm_constants.h" #include "wv_cdm_constants.h"