From 853773dd9302ce1a92864655a1dd41cb472de3a7 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 7 Aug 2017 16:03:07 +0900 Subject: [PATCH] Build widevine tests with BOARD_VNDK_VERSION set The tests are using vendor only libs such as libcdm and libwvlevel3, thus marked as LOCAL_PROPRIETARY_MODULE to use the libs. In addition, the dependency to libmedia is changed to libmedia_omx since libmedia is not available to vendor modules. UniquePtr is replaced with std::unique_ptr since UniquePtr.h in /libnativehelper is not available to vendors (and will not be completely removed in a near future). Bug: 37342627 Test: BOARD_VNDK_VERSION=current m -j tests Change-Id: I4e9d3267b20c1d52f57664b89f15330e2ebd953d --- libwvdrmengine/cdm/test/unit-test.mk | 3 ++- libwvdrmengine/mediacrypto/test/Android.mk | 2 ++ libwvdrmengine/mediadrm/test/Android.mk | 2 ++ libwvdrmengine/oemcrypto/test/Android.mk | 1 + libwvdrmengine/oemcrypto/test/common.mk | 2 +- libwvdrmengine/test/unit/Android.mk | 2 ++ .../test/unit/legacy_src/WVCreatePluginFactories_test.cpp | 7 ++++--- .../test/unit/legacy_src/WVCryptoFactory_test.cpp | 8 ++++---- libwvdrmengine/test/unit/legacy_src/WVDrmFactory_test.cpp | 1 - 9 files changed, 18 insertions(+), 10 deletions(-) diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk index 78ce40f2..a3330769 100644 --- a/libwvdrmengine/cdm/test/unit-test.mk +++ b/libwvdrmengine/cdm/test/unit-test.mk @@ -42,7 +42,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ liblog \ - libmedia \ + libmedia_omx \ libprotobuf-cpp-lite \ libssl \ libstagefright_foundation \ @@ -51,6 +51,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_CFLAGS += -DUNIT_TEST LOCAL_MODULE_OWNER := widevine +LOCAL_PROPRIETARY_MODULE := true # When built, explicitly put it in the DATA/bin directory. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index 7793584b..1fba8755 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -45,6 +45,7 @@ LOCAL_MODULE := libwvdrmmediacrypto_test LOCAL_MODULE_TAGS := tests LOCAL_MODULE_OWNER := widevine +LOCAL_PROPRIETARY_MODULE := true # When built, explicitly put it in the DATA/bin directory. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin @@ -107,6 +108,7 @@ LOCAL_MODULE := libwvdrmmediacrypto_hidl_test LOCAL_MODULE_TAGS := tests LOCAL_MODULE_OWNER := widevine +LOCAL_PROPRIETARY_MODULE := true # When built, explicitly put it in the DATA/bin directory. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 7ecd9f6f..874698d9 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -45,6 +45,7 @@ LOCAL_MODULE := libwvdrmdrmplugin_test LOCAL_MODULE_TAGS := tests LOCAL_MODULE_OWNER := widevine +LOCAL_PROPRIETARY_MODULE := true # When built, explicitly put it in the DATA/bin directory. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin @@ -108,6 +109,7 @@ LOCAL_MODULE := libwvdrmdrmplugin_hidl_test LOCAL_MODULE_TAGS := tests LOCAL_MODULE_OWNER := widevine +LOCAL_PROPRIETARY_MODULE := true # When built, explicitly put it in the DATA/bin directory. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk index 4ac91c71..5b9a1d1b 100644 --- a/libwvdrmengine/oemcrypto/test/Android.mk +++ b/libwvdrmengine/oemcrypto/test/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE:=oemcrypto_test LOCAL_MODULE_TAGS := tests LOCAL_MODULE_OWNER := widevine +LOCAL_PROPRIETARY_MODULE := true # When built, explicitly put it in the DATA/bin directory. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin diff --git a/libwvdrmengine/oemcrypto/test/common.mk b/libwvdrmengine/oemcrypto/test/common.mk index efc25c06..74be3313 100644 --- a/libwvdrmengine/oemcrypto/test/common.mk +++ b/libwvdrmengine/oemcrypto/test/common.mk @@ -31,7 +31,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ liblog \ - libmedia \ + libmedia_omx \ libstagefright_foundation \ libutils \ libz \ diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index c721c488..fced9690 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -33,6 +33,7 @@ LOCAL_MODULE := libwvdrmengine_test LOCAL_MODULE_TAGS := tests LOCAL_MODULE_OWNER := widevine +LOCAL_PROPRIETARY_MODULE := true # When built, explicitly put it in the DATA/bin directory. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin @@ -82,6 +83,7 @@ LOCAL_MODULE := libwvdrmengine_hidl_test LOCAL_MODULE_TAGS := tests LOCAL_MODULE_OWNER := widevine +LOCAL_PROPRIETARY_MODULE := true # When built, explicitly put it in the DATA/bin directory. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin diff --git a/libwvdrmengine/test/unit/legacy_src/WVCreatePluginFactories_test.cpp b/libwvdrmengine/test/unit/legacy_src/WVCreatePluginFactories_test.cpp index 391e119f..7b9fec2a 100644 --- a/libwvdrmengine/test/unit/legacy_src/WVCreatePluginFactories_test.cpp +++ b/libwvdrmengine/test/unit/legacy_src/WVCreatePluginFactories_test.cpp @@ -3,20 +3,21 @@ // #include "gtest/gtest.h" -#include #include "WVCreatePluginFactories.h" +#include + using namespace android; TEST(CreatePluginFactoriesTest, CreatesDrmFactory) { - UniquePtr factory(createDrmFactory()); + std::unique_ptr factory(createDrmFactory()); EXPECT_NE((DrmFactory*)NULL, factory.get()) << "createDrmFactory() returned null"; } TEST(CreatePluginFactoriesTest, CreatesCryptoFactory) { - UniquePtr factory(createCryptoFactory()); + std::unique_ptr factory(createCryptoFactory()); EXPECT_NE((CryptoFactory*)NULL, factory.get()) << "createCryptoFactory() returned null"; diff --git a/libwvdrmengine/test/unit/legacy_src/WVCryptoFactory_test.cpp b/libwvdrmengine/test/unit/legacy_src/WVCryptoFactory_test.cpp index 987a7586..bee0b7f6 100644 --- a/libwvdrmengine/test/unit/legacy_src/WVCryptoFactory_test.cpp +++ b/libwvdrmengine/test/unit/legacy_src/WVCryptoFactory_test.cpp @@ -2,11 +2,11 @@ * Copyright 2012 Google Inc. All Rights Reserved. */ -#include - #include "gtest/gtest.h" #include "WVCryptoFactory.h" +#include + using namespace wvdrm; const uint8_t kWidevineUUID[16] = { @@ -25,7 +25,7 @@ const uint8_t kUnknownUUID[16] = { }; TEST(WVCryptoFactoryTest, SupportsSupportedCryptoSchemes) { - UniquePtr factory(new WVCryptoFactory()); + std::unique_ptr factory(new WVCryptoFactory()); EXPECT_TRUE(factory->isCryptoSchemeSupported(kWidevineUUID)) << "WVPluginFactory does not support Widevine's UUID"; @@ -35,7 +35,7 @@ TEST(WVCryptoFactoryTest, SupportsSupportedCryptoSchemes) { } TEST(WVCryptoFactoryTest, DoesNotSupportUnsupportedCryptoSchemes) { - UniquePtr factory(new WVCryptoFactory()); + std::unique_ptr factory(new WVCryptoFactory()); EXPECT_FALSE(factory->isCryptoSchemeSupported(kUnknownUUID)) << "WVPluginFactory incorrectly claims to support an unknown UUID"; diff --git a/libwvdrmengine/test/unit/legacy_src/WVDrmFactory_test.cpp b/libwvdrmengine/test/unit/legacy_src/WVDrmFactory_test.cpp index a920358f..711960a5 100644 --- a/libwvdrmengine/test/unit/legacy_src/WVDrmFactory_test.cpp +++ b/libwvdrmengine/test/unit/legacy_src/WVDrmFactory_test.cpp @@ -3,7 +3,6 @@ */ #include "gtest/gtest.h" -#include #include "WVDrmFactory.h" using namespace wvdrm;