commit 3d17a3b0479dc549ba9f62b91819477bf2700ea4
author Vic Yang <victoryang@google.com> Thu Oct 03 15:08:40 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 03 15:08:40 2019 -0700
tree 69cd5c3b9588c6a38a3710d196d66427a3e3d1b8
parent 0bfd7133dad2870caa4fae0a29187bef2079f77f
parent 409e34c8814334f1d9d9c5aaad465c3d905c374f

Merge "Reland "binder: Use StaticString16 for interface descriptors""
am: 409e34c881

Change-Id: I4f7f4b7944c4d6bf4f4787fe2265458791a0180e

libs/binder/include/binder/IInterface.h

diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h
index 5793a1c..28ffa48 100644
--- a/libs/binder/include/binder/IInterface.h
+++ b/libs/binder/include/binder/IInterface.h
@@ -88,8 +88,12 @@
 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;                                \