Make hybrid interface descriptors StaticString16
This removes the need of runtime construction of the descriptors.
Bug: 138856262
Test: Build and boot cuttlefish.
Change-Id: Ia3a7e3e4715c9e6b3f4d5bcd4bd97ec9aa798ecd
diff --git a/transport/token/1.0/utils/include/hidl/HybridInterface.h b/transport/token/1.0/utils/include/hidl/HybridInterface.h
index 125d5e8..5c54d85 100644
--- a/transport/token/1.0/utils/include/hidl/HybridInterface.h
+++ b/transport/token/1.0/utils/include/hidl/HybridInterface.h
@@ -389,7 +389,10 @@
return getHalVariant().index(); \
} \
constexpr uint32_t I##INTERFACE::sGetHalTokenTransactionCode; \
- const ::android::String16 I##INTERFACE::descriptor(NAME); \
+ static const ::android::StaticString16 I##INTERFACE##_desc_str16( \
+ u##NAME); \
+ const ::android::String16 I##INTERFACE::descriptor( \
+ I##INTERFACE##_desc_str16); \
const ::android::String16& \
I##INTERFACE::getInterfaceDescriptor() const { \
return I##INTERFACE::descriptor; \