From 0d5a8ccc7a02278b8b4205829eda6ad75626a0f6 Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Thu, 31 Jan 2013 09:22:22 -0800 Subject: [PATCH] Move OEMCrypto Mock files to Clear Key Library In order to match the other implementations of CDM, we are going to replace the android OEMCrypto mockup with the one in the cdm repository. This would be disruptive to the clear key library because it relies on the current implementation of the mockup. In order to prevent that, I am moving the current mockup into the same directory as the clear key library. Then, we can put the new mockup under the directory libwvdrmengine. This mockup will then be deleted when the clear key library is deleted. Change-Id: I89ee23f249dacd18241ae5ca499329e620bf5a2c --- libclearkeydrmengine/Android.mk | 4 ++-- libclearkeydrmengine/crypto/Android.mk | 2 +- libclearkeydrmengine/crypto/test/Android.mk | 2 +- libclearkeydrmengine/inttest/Android.mk | 4 ++-- .../oemcrypto/include/OEMCryptoDASH.h | 0 .../oemcrypto/mock/Android.mk | 2 +- .../oemcrypto/mock/MockOEMCrypto.cpp | 0 .../oemcrypto/mock/MockOEMCrypto.h | 0 .../oemcrypto/mock/OEMCryptoWrapper.cpp | 0 .../oemcrypto/mock/wvcrc.cpp | 0 .../oemcrypto/mock/wvcrc32.h | 0 .../oemcrypto/test/Android.mk | 6 +++--- .../oemcrypto/test/TestOEMCrypto.cpp | 0 libclearkeydrmengine/test/Android.mk | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) rename {libwvdrmengine => libclearkeydrmengine}/oemcrypto/include/OEMCryptoDASH.h (100%) rename {libwvdrmengine => libclearkeydrmengine}/oemcrypto/mock/Android.mk (86%) rename {libwvdrmengine => libclearkeydrmengine}/oemcrypto/mock/MockOEMCrypto.cpp (100%) rename {libwvdrmengine => libclearkeydrmengine}/oemcrypto/mock/MockOEMCrypto.h (100%) rename {libwvdrmengine => libclearkeydrmengine}/oemcrypto/mock/OEMCryptoWrapper.cpp (100%) rename {libwvdrmengine => libclearkeydrmengine}/oemcrypto/mock/wvcrc.cpp (100%) rename {libwvdrmengine => libclearkeydrmengine}/oemcrypto/mock/wvcrc32.h (100%) rename {libwvdrmengine => libclearkeydrmengine}/oemcrypto/test/Android.mk (76%) rename {libwvdrmengine => libclearkeydrmengine}/oemcrypto/test/TestOEMCrypto.cpp (100%) diff --git a/libclearkeydrmengine/Android.mk b/libclearkeydrmengine/Android.mk index 43b720d1..7f45fadb 100644 --- a/libclearkeydrmengine/Android.mk +++ b/libclearkeydrmengine/Android.mk @@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := \ frameworks/av/include \ vendor/widevine/libclearkeydrmengine/include \ vendor/widevine/libclearkeydrmengine/crypto/include \ - vendor/widevine/libwvdrmengine/oemcrypto/include \ + vendor/widevine/libclearkeydrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ libwvclearkeycryptoplugin \ @@ -31,4 +31,4 @@ include $(BUILD_SHARED_LIBRARY) # Sublibraries Needed: include vendor/widevine/libclearkeydrmengine/crypto/Android.mk -include vendor/widevine/libwvdrmengine/oemcrypto/mock/Android.mk +include vendor/widevine/libclearkeydrmengine/oemcrypto/mock/Android.mk diff --git a/libclearkeydrmengine/crypto/Android.mk b/libclearkeydrmengine/crypto/Android.mk index f4a7cb76..7a080850 100644 --- a/libclearkeydrmengine/crypto/Android.mk +++ b/libclearkeydrmengine/crypto/Android.mk @@ -6,7 +6,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ vendor/widevine/libclearkeydrmengine/crypto/include \ - vendor/widevine/libwvdrmengine/oemcrypto/include \ + vendor/widevine/libclearkeydrmengine/oemcrypto/include \ LOCAL_MODULE := libwvclearkeycryptoplugin diff --git a/libclearkeydrmengine/crypto/test/Android.mk b/libclearkeydrmengine/crypto/test/Android.mk index 895e3302..5a27aa6d 100644 --- a/libclearkeydrmengine/crypto/test/Android.mk +++ b/libclearkeydrmengine/crypto/test/Android.mk @@ -9,7 +9,7 @@ LOCAL_C_INCLUDES := \ external/gtest/include \ external/stlport/stlport \ vendor/widevine/libclearkeydrmengine/crypto/include \ - vendor/widevine/libwvdrmengine/oemcrypto/include \ + vendor/widevine/libclearkeydrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ libgtest \ diff --git a/libclearkeydrmengine/inttest/Android.mk b/libclearkeydrmengine/inttest/Android.mk index a8bc22cf..37d91235 100644 --- a/libclearkeydrmengine/inttest/Android.mk +++ b/libclearkeydrmengine/inttest/Android.mk @@ -11,8 +11,8 @@ LOCAL_C_INCLUDES := \ external/openssl/include \ external/stlport/stlport \ vendor/widevine/libclearkeydrmengine/include \ - vendor/widevine/libwvdrmengine/oemcrypto/mock \ - vendor/widevine/libwvdrmengine/oemcrypto/include \ + vendor/widevine/libclearkeydrmengine/oemcrypto/mock \ + vendor/widevine/libclearkeydrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ libgtest \ diff --git a/libwvdrmengine/oemcrypto/include/OEMCryptoDASH.h b/libclearkeydrmengine/oemcrypto/include/OEMCryptoDASH.h similarity index 100% rename from libwvdrmengine/oemcrypto/include/OEMCryptoDASH.h rename to libclearkeydrmengine/oemcrypto/include/OEMCryptoDASH.h diff --git a/libwvdrmengine/oemcrypto/mock/Android.mk b/libclearkeydrmengine/oemcrypto/mock/Android.mk similarity index 86% rename from libwvdrmengine/oemcrypto/mock/Android.mk rename to libclearkeydrmengine/oemcrypto/mock/Android.mk index e7fa9aaa..e9daf8df 100644 --- a/libwvdrmengine/oemcrypto/mock/Android.mk +++ b/libclearkeydrmengine/oemcrypto/mock/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := MockOEMCrypto.cpp \ OEMCryptoWrapper.cpp \ wvcrc.cpp \ -LOCAL_C_INCLUDES += vendor/widevine/libwvdrmengine/oemcrypto/include \ +LOCAL_C_INCLUDES += vendor/widevine/libclearkeydrmengine/oemcrypto/include \ external/openssl/include \ external/openssh diff --git a/libwvdrmengine/oemcrypto/mock/MockOEMCrypto.cpp b/libclearkeydrmengine/oemcrypto/mock/MockOEMCrypto.cpp similarity index 100% rename from libwvdrmengine/oemcrypto/mock/MockOEMCrypto.cpp rename to libclearkeydrmengine/oemcrypto/mock/MockOEMCrypto.cpp diff --git a/libwvdrmengine/oemcrypto/mock/MockOEMCrypto.h b/libclearkeydrmengine/oemcrypto/mock/MockOEMCrypto.h similarity index 100% rename from libwvdrmengine/oemcrypto/mock/MockOEMCrypto.h rename to libclearkeydrmengine/oemcrypto/mock/MockOEMCrypto.h diff --git a/libwvdrmengine/oemcrypto/mock/OEMCryptoWrapper.cpp b/libclearkeydrmengine/oemcrypto/mock/OEMCryptoWrapper.cpp similarity index 100% rename from libwvdrmengine/oemcrypto/mock/OEMCryptoWrapper.cpp rename to libclearkeydrmengine/oemcrypto/mock/OEMCryptoWrapper.cpp diff --git a/libwvdrmengine/oemcrypto/mock/wvcrc.cpp b/libclearkeydrmengine/oemcrypto/mock/wvcrc.cpp similarity index 100% rename from libwvdrmengine/oemcrypto/mock/wvcrc.cpp rename to libclearkeydrmengine/oemcrypto/mock/wvcrc.cpp diff --git a/libwvdrmengine/oemcrypto/mock/wvcrc32.h b/libclearkeydrmengine/oemcrypto/mock/wvcrc32.h similarity index 100% rename from libwvdrmengine/oemcrypto/mock/wvcrc32.h rename to libclearkeydrmengine/oemcrypto/mock/wvcrc32.h diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libclearkeydrmengine/oemcrypto/test/Android.mk similarity index 76% rename from libwvdrmengine/oemcrypto/test/Android.mk rename to libclearkeydrmengine/oemcrypto/test/Android.mk index 5dc3fe28..9e60ef90 100644 --- a/libwvdrmengine/oemcrypto/test/Android.mk +++ b/libclearkeydrmengine/oemcrypto/test/Android.mk @@ -9,8 +9,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_C_INCLUDES += \ bionic \ - vendor/widevine/libwvdrmengine/oemcrypto/include \ - vendor/widevine/libwvdrmengine/oemcrypto/mock \ + vendor/widevine/libclearkeydrmengine/oemcrypto/include \ + vendor/widevine/libclearkeydrmengine/oemcrypto/mock \ external/gtest/include \ external/openssl/include \ external/stlport/stlport \ @@ -34,4 +34,4 @@ LOCAL_MODULE:=test-oemcrypto include $(BUILD_EXECUTABLE) # Sublibraries Needed: -include vendor/widevine/libwvdrmengine/oemcrypto/mock/Android.mk +include vendor/widevine/libclearkeydrmengine/oemcrypto/mock/Android.mk diff --git a/libwvdrmengine/oemcrypto/test/TestOEMCrypto.cpp b/libclearkeydrmengine/oemcrypto/test/TestOEMCrypto.cpp similarity index 100% rename from libwvdrmengine/oemcrypto/test/TestOEMCrypto.cpp rename to libclearkeydrmengine/oemcrypto/test/TestOEMCrypto.cpp diff --git a/libclearkeydrmengine/test/Android.mk b/libclearkeydrmengine/test/Android.mk index fca8ef4e..62ef8b08 100644 --- a/libclearkeydrmengine/test/Android.mk +++ b/libclearkeydrmengine/test/Android.mk @@ -14,7 +14,7 @@ LOCAL_C_INCLUDES := \ external/stlport/stlport \ vendor/widevine/libclearkeydrmengine/include \ vendor/widevine/libclearkeydrmengine/crypto/include \ - vendor/widevine/libwvdrmengine/oemcrypto/include \ + vendor/widevine/libclearkeydrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ libgtest \