Merge "Remove ODK from unused makefiles" into rvc-dev

2020-03-09 21:05:22 +00:00
parent 0bd6a38096 96dc665cd5
commit 7da5b8be92
3 changed files with 0 additions and 4 deletions
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -168,7 +168,6 @@ LOCAL_STATIC_LIBRARIES := \
  libwvdrmcryptoplugin \
  libwvdrmdrmplugin \
  libwvlevel3 \
-  libwv_odk \

 LOCAL_SHARED_LIBRARIES := \
  libbase \
@@ -230,7 +229,6 @@ LOCAL_STATIC_LIBRARIES := \
  libwvdrmcryptoplugin_hidl \
  libwvdrmdrmplugin_hidl \
  libwvlevel3 \
-  libwv_odk \

 LOCAL_SHARED_LIBRARIES := \
  android.hardware.drm@1.0 \
--- a/libwvdrmengine/cdm/Android.bp
+++ b/libwvdrmengine/cdm/Android.bp
@@ -17,7 +17,6 @@ cc_library_static {
        "vendor/widevine/libwvdrmengine/cdm/util/include",
        "vendor/widevine/libwvdrmengine/cdm/include",
        "vendor/widevine/libwvdrmengine/oemcrypto/include",
-        "vendor/widevine/libwvdrmengine/oemcrypto/odk/include",
        "external/jsmn",
        "external/protobuf/src",
    ],
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -33,7 +33,6 @@
 #include "license_protocol.pb.h"
 #include "log.h"
 #include "metrics_collections.h"
-#include "odk.h"
 #include "properties.h"
 #include "wv_cdm_constants.h"