From 96dc665cd5b0043903adae6a03416eaf55534b0e Mon Sep 17 00:00:00 2001
From: Fred Gylys-Colwell <fredgc@google.com>
Date: Wed, 4 Mar 2020 15:14:01 -0800
Subject: [PATCH] Remove ODK from unused makefiles

Merge from Widevine repo of http://go/wvgerrit/95087

The ODK library is used in OEMCrypto, and in test code, but it is not
needed in the CDM layer. As such, it can be removed from the
Android.mk for cdm libraries.

Bug: 150809634
Test: unit tests
Change-Id: If29458e7d3d940f9a383d77e5082e7388e19c32f
---
 libwvdrmengine/Android.mk                                 | 2 --
 libwvdrmengine/cdm/Android.bp                             | 1 -
 libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp | 1 -
 3 files changed, 4 deletions(-)

diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index 31f2e751..6f258625 100644
--- 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 \
diff --git a/libwvdrmengine/cdm/Android.bp b/libwvdrmengine/cdm/Android.bp
index a095eec5..4ad49ab4 100644
--- 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",
     ],
diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
index 6d6baea2..e35c163d 100644
--- 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"