commit 85956b93b5f7d813d14b6a1d8ef8d6e27ff86a2f
author Vic Yang <victoryang@google.com> Wed Sep 18 10:18:20 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 18 10:18:20 2019 -0700
tree ecf7169fb9152903df3dc7e725da124dfd0b39f2
parent 910206c397d1b5bf7ff3565a5aa8c06c1a2d6dac
parent 8e34e87e59015c7f71e006133abc7b15bae7f4ae

Merge "binder: Use StaticString16 for interface descriptors"
am: 8e34e87e59

Change-Id: I717f8e2e0a4d2c7bf7c1e4ff3eac06f5b57b45b3

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