From 6bc69d50058dff9017daecc0d1f3f9b6acef8a56 Mon Sep 17 00:00:00 2001 From: Alex Dale Date: Mon, 1 Aug 2022 15:40:54 -0700 Subject: [PATCH] Remove CORE_UTIL_EXPORT [ Merge of http://go/wvgerrit/155070 ] These functions are internal utilities and should not be exported from our library. IIRC, this was added to aid in Windows tests, but this is no longer needed. Bug: 236317198 Test: build_and_run_all_unit_tests.sh Change-Id: I19beb35a15f0f87dc8f968e1dd5302aed9463e54 --- libwvdrmengine/Android.bp | 3 -- libwvdrmengine/cdm/util/include/file_store.h | 4 +- libwvdrmengine/cdm/util/include/log.h | 13 ++--- libwvdrmengine/cdm/util/include/platform.h | 2 +- libwvdrmengine/cdm/util/include/rw_lock.h | 2 +- .../cdm/util/include/string_conversions.h | 49 ++++++++----------- libwvdrmengine/cdm/util/include/util_common.h | 12 ----- 7 files changed, 29 insertions(+), 56 deletions(-) diff --git a/libwvdrmengine/Android.bp b/libwvdrmengine/Android.bp index dc761610..476dc6e7 100644 --- a/libwvdrmengine/Android.bp +++ b/libwvdrmengine/Android.bp @@ -338,7 +338,6 @@ cc_library_static { ], cflags: [ - "-DCORE_UTIL_IMPLEMENTATION", "-DIS_HIDL", ], @@ -371,8 +370,6 @@ cc_library_static { "liblog", ], - cflags: ["-DCORE_UTIL_IMPLEMENTATION"], - srcs: cdm_util_src_files, } diff --git a/libwvdrmengine/cdm/util/include/file_store.h b/libwvdrmengine/cdm/util/include/file_store.h index 85943564..6bb1773c 100644 --- a/libwvdrmengine/cdm/util/include/file_store.h +++ b/libwvdrmengine/cdm/util/include/file_store.h @@ -28,7 +28,7 @@ static const std::string kOemCertificateFileName = "oemcert.bin"; static const std::string kOemCertificateFileNamePrefix = "oemcert_"; // File class. The implementation is platform dependent. -class CORE_UTIL_EXPORT File { +class File { public: File() {} virtual ~File() {} @@ -39,7 +39,7 @@ class CORE_UTIL_EXPORT File { CORE_DISALLOW_COPY_AND_ASSIGN(File); }; -class CORE_UTIL_EXPORT FileSystem { +class FileSystem { public: FileSystem(); FileSystem(const std::string& origin, void* extra_data); diff --git a/libwvdrmengine/cdm/util/include/log.h b/libwvdrmengine/cdm/util/include/log.h index d1658e3f..2854956d 100644 --- a/libwvdrmengine/cdm/util/include/log.h +++ b/libwvdrmengine/cdm/util/include/log.h @@ -77,18 +77,13 @@ struct LoggingUidSetter { // This function is supplied for cases where the system layer does not // initialize logging. This is also needed to initialize logging in // unit tests. -CORE_UTIL_EXPORT void InitLogging(); +void InitLogging(); #ifdef __GNUC__ -[[gnu::format(printf, 5, 6)]] CORE_UTIL_EXPORT void Log(const char* file, - const char* function, - int line, - LogPriority level, - const char* fmt, ...); -#else -CORE_UTIL_EXPORT void Log(const char* file, const char* function, int line, - LogPriority level, const char* fmt, ...); +[[gnu::format(printf, 5, 6)]] #endif +void Log(const char* file, const char* function, int line, + LogPriority level, const char* fmt, ...); // Log APIs #ifdef CDM_DISABLE_LOGGING diff --git a/libwvdrmengine/cdm/util/include/platform.h b/libwvdrmengine/cdm/util/include/platform.h index effc5144..d101dd6e 100644 --- a/libwvdrmengine/cdm/util/include/platform.h +++ b/libwvdrmengine/cdm/util/include/platform.h @@ -21,7 +21,7 @@ using ssize_t = SSIZE_T; inline void sleep(int seconds) { Sleep(seconds * 1000); } -CORE_UTIL_EXPORT int setenv(const char* key, const char* value, int overwrite); +int setenv(const char* key, const char* value, int overwrite); #else # include # include diff --git a/libwvdrmengine/cdm/util/include/rw_lock.h b/libwvdrmengine/cdm/util/include/rw_lock.h index 5ea3a976..40d79028 100644 --- a/libwvdrmengine/cdm/util/include/rw_lock.h +++ b/libwvdrmengine/cdm/util/include/rw_lock.h @@ -16,7 +16,7 @@ namespace wvutil { // A simple reader-writer mutex implementation that mimics the one from C++17 -class CORE_UTIL_EXPORT shared_mutex { +class shared_mutex { public: shared_mutex() : reader_count_(0), has_writer_(false) {} ~shared_mutex(); diff --git a/libwvdrmengine/cdm/util/include/string_conversions.h b/libwvdrmengine/cdm/util/include/string_conversions.h index e5944bd6..461ef41e 100644 --- a/libwvdrmengine/cdm/util/include/string_conversions.h +++ b/libwvdrmengine/cdm/util/include/string_conversions.h @@ -15,53 +15,46 @@ namespace wvutil { // ASCII hex to Binary conversion. -CORE_UTIL_EXPORT std::vector a2b_hex(const std::string& b); -CORE_UTIL_EXPORT std::vector a2b_hex(const std::string& label, - const std::string& b); -CORE_UTIL_EXPORT std::string a2bs_hex(const std::string& b); +std::vector a2b_hex(const std::string& b); +std::vector a2b_hex(const std::string& label, + const std::string& b); +std::string a2bs_hex(const std::string& b); // Binary to ASCII hex conversion. The default versions limit output to 2k to // protect us from log spam. The unlimited version has no length limit. -CORE_UTIL_EXPORT std::string b2a_hex(const std::vector& b); -CORE_UTIL_EXPORT std::string unlimited_b2a_hex(const std::vector& b); -CORE_UTIL_EXPORT std::string b2a_hex(const std::string& b); -CORE_UTIL_EXPORT std::string unlimited_b2a_hex(const std::string& b); -CORE_UTIL_EXPORT std::string HexEncode(const uint8_t* bytes, size_t size); -CORE_UTIL_EXPORT std::string UnlimitedHexEncode(const uint8_t* bytes, - size_t size); +std::string b2a_hex(const std::vector& b); +std::string unlimited_b2a_hex(const std::vector& b); +std::string b2a_hex(const std::string& b); +std::string unlimited_b2a_hex(const std::string& b); +std::string HexEncode(const uint8_t* bytes, size_t size); +std::string UnlimitedHexEncode(const uint8_t* bytes, size_t size); // Base64 encoding/decoding. // Converts binary data into the ASCII Base64 character set and vice // versa using the encoding rules defined in RFC4648 section 4. -CORE_UTIL_EXPORT std::string Base64Encode( - const std::vector& bin_input); -CORE_UTIL_EXPORT std::string Base64Encode(const std::string& bin_input); -CORE_UTIL_EXPORT std::vector Base64Decode( - const std::string& bin_input); +std::string Base64Encode(const std::vector& bin_input); +std::string Base64Encode(const std::string& bin_input); +std::vector Base64Decode(const std::string& bin_input); // URL-Safe Base64 encoding/decoding. // Converts binary data into the URL/Filename safe ASCII Base64 // character set and vice versa using the encoding rules defined in // RFC4648 section 5. -CORE_UTIL_EXPORT std::string Base64SafeEncode( - const std::vector& bin_input); -CORE_UTIL_EXPORT std::string Base64SafeEncode(const std::string& bin_input); -CORE_UTIL_EXPORT std::vector Base64SafeDecode( - const std::string& bin_input); +std::string Base64SafeEncode(const std::vector& bin_input); +std::string Base64SafeEncode(const std::string& bin_input); +std::vector Base64SafeDecode(const std::string& bin_input); // URL-Safe Base64 encoding without padding. // Similar to Base64SafeEncode(), without any padding character '=' // at the end. -CORE_UTIL_EXPORT std::string Base64SafeEncodeNoPad( - const std::vector& bin_input); -CORE_UTIL_EXPORT std::string Base64SafeEncodeNoPad( - const std::string& bin_input); +std::string Base64SafeEncodeNoPad(const std::vector& bin_input); +std::string Base64SafeEncodeNoPad(const std::string& bin_input); // Host to Network/Network to Host conversion. -CORE_UTIL_EXPORT int64_t htonll64(int64_t x); -CORE_UTIL_EXPORT inline int64_t ntohll64(int64_t x) { return htonll64(x); } +int64_t htonll64(int64_t x); +inline int64_t ntohll64(int64_t x) { return htonll64(x); } // Encode unsigned integer into a big endian formatted string. -CORE_UTIL_EXPORT std::string EncodeUint32(uint32_t u); +std::string EncodeUint32(uint32_t u); } // namespace wvutil diff --git a/libwvdrmengine/cdm/util/include/util_common.h b/libwvdrmengine/cdm/util/include/util_common.h index 7b28c482..b1ddc16b 100644 --- a/libwvdrmengine/cdm/util/include/util_common.h +++ b/libwvdrmengine/cdm/util/include/util_common.h @@ -9,23 +9,11 @@ #ifdef _WIN32 -# ifdef CORE_UTIL_IMPLEMENTATION -# define CORE_UTIL_EXPORT __declspec(dllexport) -# else -# define CORE_UTIL_EXPORT __declspec(dllimport) -# endif - # define CORE_UTIL_IGNORE_DEPRECATED # define CORE_UTIL_RESTORE_WARNINGS #else -# ifdef CORE_UTIL_IMPLEMENTATION -# define CORE_UTIL_EXPORT __attribute__((visibility("default"))) -# else -# define CORE_UTIL_EXPORT -# endif - # ifdef __GNUC__ # define CORE_UTIL_IGNORE_DEPRECATED \ _Pragma("GCC diagnostic push") \