Temporarily remove json dependency in oemcrypto v18 unit test

Disable one oemcrypto v18 unit test which takes nlohmann-json dependency
for now, until the json dependency is fixed.

Test: build widevine and oemcrypto unit tests
Bug: 263397641
Change-Id: I065b28a81cc481b2b64bda27733640e0fdea0c2c
This commit is contained in:
Cong Lin
2022-12-21 13:23:21 -08:00
parent 0080d04579
commit 7474b41fd0
4 changed files with 3 additions and 20915 deletions

View File

@@ -35,7 +35,6 @@ LOCAL_C_INCLUDES += \
vendor/widevine/libwvdrmengine/cdm/core/include \
vendor/widevine/libwvdrmengine/cdm/util/include \
vendor/widevine/libwvdrmengine/cdm/util/test \
vendor/widevine/libwvdrmengine/third_party/nlohmann-json/single_include \
LOCAL_STATIC_LIBRARIES := \
libcdm \

View File

@@ -48,7 +48,6 @@
#include "OEMCryptoCENC.h"
#include "clock.h"
#include "log.h"
#include "nlohmann/json.hpp"
#include "oec_decrypt_fallback_chain.h"
#include "oec_device_features.h"
#include "oec_extra_test_keys.h"
@@ -70,7 +69,6 @@ using ::testing::tuple;
using ::testing::Values;
using ::testing::WithParamInterface;
using namespace std;
using json = nlohmann::json;
namespace std { // GTest wants PrintTo to be in the std namespace.
void PrintTo(const tuple<OEMCrypto_CENCEncryptPatternDesc, OEMCryptoCipherMode,
@@ -448,6 +446,8 @@ TEST_F(OEMCryptoClientTest, CheckNullBuildInformationAPI17) {
}
}
// TODO(b/263397641): Re-enable this when json dependency is resolved.
/*
TEST_F(OEMCryptoClientTest, CheckJsonBuildInformationAPI18) {
std::string build_info;
OEMCryptoResult sts = OEMCrypto_BuildInformation(&build_info[0], nullptr);
@@ -481,6 +481,7 @@ TEST_F(OEMCryptoClientTest, CheckJsonBuildInformationAPI18) {
ASSERT_TRUE(parsed.contains("tee_os_ver"));
ASSERT_TRUE(parsed["tee_os_ver"].is_string());
}
*/
TEST_F(OEMCryptoClientTest, CheckMaxNumberOfSessionsAPI10) {
size_t sessions_count;

View File

@@ -1,21 +0,0 @@
MIT License
Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

File diff suppressed because it is too large Load Diff