commit adbb90baf6164ef7a0ee16b387abfd61a9673f6d
author Vic Yang <victoryang@google.com> Thu Oct 03 15:27:46 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 03 15:27:46 2019 -0700
tree 03523aafea3008f82818369da9b82c74a5c1fce9
parent 4fe294085879495aae16002559be1c5b51d82fcc
parent dab8808c86413983fb1ee706ad266abdaf7d9512

Merge "Reland "binder: Use StaticString16 for interface descriptors"" am: 409e34c881 am: 3d17a3b047 am: 2d4f561ca9
am: dab8808c86

Change-Id: Id2d2a2f905b0e1178cb7a3721d724b30f1938762

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;                                \