Merge "libbinder: export shared headers on Trusty" am: 1ea5882095

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2161046

Change-Id: I382a6dfbf51f8f5d56ddbd657fbfe4aa943cab6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/trusty/rules.mk b/libs/binder/trusty/rules.mk
index cd81a09..83475f5 100644
--- a/libs/binder/trusty/rules.mk
+++ b/libs/binder/trusty/rules.mk
@@ -69,6 +69,11 @@
 	$(LIBUTILS_DIR)/include \
 	$(FMTLIB_DIR)/include \
 
+# The android/binder_to_string.h header is shared between libbinder and
+# libbinder_ndk and included by auto-generated AIDL C++ files
+MODULE_EXPORT_INCLUDES += \
+	$(LIBBINDER_DIR)/ndk/include_cpp \
+
 MODULE_EXPORT_COMPILEFLAGS += \
 	-DBINDER_NO_KERNEL_IPC \
 	-DBINDER_RPC_SINGLE_THREADED \