diff options
| -rw-r--r-- | libs/binder/include/binder/IInterface.h | 6 | 
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h index 5793a1cf6b..28ffa48e32 100644 --- a/libs/binder/include/binder/IInterface.h +++ b/libs/binder/include/binder/IInterface.h @@ -88,8 +88,12 @@ private:                                                                \  public:                                                                 \ +#define __IINTF_CONCAT(x, y) (x ## y)  #define IMPLEMENT_META_INTERFACE(INTERFACE, NAME)                       \ -    const ::android::String16 I##INTERFACE::descriptor(NAME);           \ +    const ::android::StaticString16                                     \ +        I##INTERFACE##_descriptor_static_str16(__IINTF_CONCAT(u, NAME));\ +    const ::android::String16 I##INTERFACE::descriptor(                 \ +        I##INTERFACE##_descriptor_static_str16);                        \      const ::android::String16&                                          \              I##INTERFACE::getInterfaceDescriptor() const {              \          return I##INTERFACE::descriptor;                                \  |