diff options
| author | Daniel Erat <derat@google.com> | 2015-07-15 16:39:59 -0600 |
|---|---|---|
| committer | Daniel Erat <derat@google.com> | 2015-07-15 16:57:40 -0600 |
| commit | 9f1a55719d7d1c44c672acb98875c5fb95edc9a3 (patch) | |
| tree | 14d48f2fea700d051c2f0f63755dd90d82bdf375 | |
| parent | 7330e092f3048df161495780270b1be8cbd857b0 (diff) | |
| download | dbus-9f1a55719d7d1c44c672acb98875c5fb95edc9a3.tar.gz | |
Fix LOCAL_EXPORT_C_INCLUDE_DIRS for dbus subdirectory.
libdbus's headers are typically included as e.g.
<dbus/dbus.h>, so the dbus/ subdirectory should export its
parent directory instead of itself.
Also add dbus/dbus-misc.c to the list of source files so
libchrome can call dbus_get_version().
Bug: 22328216
Change-Id: Ie4a7f2f9a937743ebed54e8c1067beb406ecd0ba
| -rw-r--r-- | dbus/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dbus/Android.mk b/dbus/Android.mk index ad163047..376185ec 100644 --- a/dbus/Android.mk +++ b/dbus/Android.mk @@ -28,6 +28,7 @@ LOCAL_SRC_FILES:= \ dbus-mempool.c \ dbus-memory.c \ dbus-message.c \ + dbus-misc.c \ dbus-nonce.c \ dbus-pending-call.c \ dbus-pipe.c \ @@ -64,7 +65,7 @@ LOCAL_C_INCLUDES+= $(LOCAL_PATH)/.. LOCAL_MODULE:=libdbus -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/.. LOCAL_CFLAGS+= \ -DDBUS_COMPILATION \ |