From 3feee7ee05ab0227435515a07d3bb5907f17715a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 26 Oct 2018 13:22:17 -0700 Subject: [PATCH] Adapt to google::protobuf::uint64 type change Protobuf 3.5.2 redefines google::protobuf::uint64 from unsigned long long to uint64_t, which is sometimes unsigned long and sometimes unsigned long long. Use PRIu64 to print it. Bug: 117607748 Test: m checkbuild Change-Id: Ifdbc33cdafca5b82a1ffbcbfa4e292a819deb244 --- drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp | 2 +- drm/mediacas/plugins/clearkey/ecm.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp b/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp index eaa3390d0b..cb69f911ff 100644 --- a/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp +++ b/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp @@ -89,7 +89,7 @@ status_t ClearKeyFetcher::ObtainKey(const sp& buffer, // asset_id change. If it sends an EcmContainer with 2 Ecms with different // asset_ids (old and new) then it might be best to prefetch the Emm. if ((asset_.id() != 0) && (*asset_id != asset_.id())) { - ALOGW("Asset_id change from %llu to %" PRIu64, asset_.id(), *asset_id); + ALOGW("Asset_id change from %" PRIu64 " to %" PRIu64, asset_.id(), *asset_id); asset_.Clear(); } diff --git a/drm/mediacas/plugins/clearkey/ecm.cpp b/drm/mediacas/plugins/clearkey/ecm.cpp index 9fde13aea1..b3b521807e 100644 --- a/drm/mediacas/plugins/clearkey/ecm.cpp +++ b/drm/mediacas/plugins/clearkey/ecm.cpp @@ -17,6 +17,8 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "ecm" +#include + #include "ecm.h" #include "ecm_generator.h" #include "protos/license_protos.pb.h" @@ -76,7 +78,7 @@ status_t Ecm::Decrypt( return status; } if (asset.id() != asset_from_emm.id()) { - ALOGE("Asset_id from Emm (%llu) does not match asset_id from Ecm (%llu).", + ALOGE("Asset_id from Emm (%" PRIu64 ") does not match asset_id from Ecm (%" PRIu64 ").", asset_from_emm.id(), asset.id()); return CLEARKEY_STATUS_INVALID_PARAMETER; }