commit 862e50c5f17bd6111ca14ca41f4efd3f11ff1917
author Vic Yang <victoryang@google.com> Wed Sep 18 10:35:09 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 18 10:35:09 2019 -0700
tree 5e3524371fa48ce10c0d7aa578eb0dc7a5b8cf3c
parent 15dee6bf05224f478f74c14260eb5e9e54d9d74a
parent d0a02127254fda0be05c8aaef0e17f619fd80548

Merge "binder: Use StaticString16 for interface descriptors" am: 8e34e87e59 am: 85956b93b5 am: 6d9076ee2e
am: d0a0212725

Change-Id: I0698a0de5aeeb54e4281a403d27f93f1c0a32f05

libs/binder/include/binder/IInterface.h

diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h
index 0d30560..adc1f05 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;                                \