Merge "Convert Android.mk to Android.bp"
am: 7ee95c3a50
Change-Id: I24f4b076a5d79b0671d70e6e3659c44e0782a1ef
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..35c4c91
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,9 @@
+subdirs = [
+ "bus",
+ "dbus",
+]
+
+cc_library_static {
+ name: "libdbus-headers",
+ export_include_dirs: ["."],
+}
diff --git a/bus/Android.bp b/bus/Android.bp
new file mode 100644
index 0000000..7ab773b
--- /dev/null
+++ b/bus/Android.bp
@@ -0,0 +1,41 @@
+cc_binary {
+ name: "dbus-daemon",
+
+ cflags: [
+ "-O3",
+ "-DDBUS_COMPILATION",
+ "-DDBUS_DAEMON_NAME=\\\"dbus-daemon\\\"",
+ "-DDBUS_SYSTEM_CONFIG_FILE=\\\"/system/etc/dbus.conf\\\"",
+ "-DDBUS_SESSION_CONFIG_FILE=\\\"/system/etc/session.conf\\\"",
+ "-Wno-address",
+ "-Wno-empty-body",
+ "-Wno-pointer-sign",
+ "-Wno-sign-compare",
+ "-Wno-unused-parameter",
+ ],
+
+ srcs: [
+ "activation.c",
+ "bus.c",
+ "config-loader-expat.c",
+ "config-parser.c",
+ "config-parser-common.c",
+ "connection.c",
+ "desktop-file.c",
+ "dir-watch-default.c",
+ "dispatch.c",
+ "driver.c",
+ "expirelist.c",
+ "main.c",
+ "policy.c",
+ "selinux.c",
+ "services.c",
+ "signals.c",
+ "utils.c",
+ ],
+
+ shared_libs: [
+ "libexpat",
+ "libdbus",
+ ],
+}
diff --git a/bus/Android.mk b/bus/Android.mk
deleted file mode 100644
index a0a963b..0000000
--- a/bus/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_C_INCLUDES:= $(LOCAL_PATH)/..
-
-LOCAL_CFLAGS:= \
- -O3 \
- -DDBUS_COMPILATION \
- -DDBUS_DAEMON_NAME=\"dbus-daemon\" \
- -DDBUS_SYSTEM_CONFIG_FILE=\"/system/etc/dbus.conf\" \
- -DDBUS_SESSION_CONFIG_FILE=\"/system/etc/session.conf\" \
- -Wno-address \
- -Wno-empty-body \
- -Wno-pointer-sign \
- -Wno-sign-compare \
- -Wno-unused-parameter
-
-LOCAL_SRC_FILES:= \
- activation.c \
- bus.c \
- config-loader-expat.c \
- config-parser.c \
- config-parser-common.c \
- connection.c \
- desktop-file.c \
- dir-watch-default.c \
- dispatch.c \
- driver.c \
- expirelist.c \
- main.c \
- policy.c \
- selinux.c \
- services.c \
- signals.c \
- utils.c
-
-LOCAL_SHARED_LIBRARIES := \
- libexpat \
- libdbus
-
-LOCAL_MODULE:=dbus-daemon
-
-include $(BUILD_EXECUTABLE)
diff --git a/dbus/Android.bp b/dbus/Android.bp
new file mode 100644
index 0000000..5d12346
--- /dev/null
+++ b/dbus/Android.bp
@@ -0,0 +1,86 @@
+cc_library_shared {
+ name: "libdbus",
+
+ srcs: [
+ "dbus-address.c",
+ "dbus-auth.c",
+ "dbus-bus.c",
+ "dbus-connection.c",
+ "dbus-credentials.c",
+ "dbus-dataslot.c",
+ "dbus-errors.c",
+ "dbus-file.c",
+ "dbus-file-unix.c",
+ "dbus-hash.c",
+ "dbus-internals.c",
+ "dbus-keyring.c",
+ "dbus-list.c",
+ "dbus-mainloop.c",
+ "dbus-marshal-basic.c",
+ "dbus-marshal-byteswap.c",
+ "dbus-marshal-header.c",
+ "dbus-marshal-recursive.c",
+ "dbus-marshal-validate.c",
+ "dbus-mempool.c",
+ "dbus-memory.c",
+ "dbus-message.c",
+ "dbus-misc.c",
+ "dbus-nonce.c",
+ "dbus-pending-call.c",
+ "dbus-pipe.c",
+ "dbus-pipe-unix.c",
+ "dbus-resources.c",
+ "dbus-server.c",
+ "dbus-server-socket.c",
+ "dbus-server-unix.c",
+ "dbus-sha.c",
+ "dbus-shell.c",
+ "dbus-signature.c",
+ "dbus-socket-set.c",
+ "dbus-socket-set-poll.c",
+ "dbus-spawn.c",
+ "dbus-string.c",
+ "dbus-string-util.c",
+ "dbus-sysdeps.c",
+ "dbus-sysdeps-pthread.c",
+ "dbus-sysdeps-unix.c",
+ "dbus-sysdeps-util.c",
+ "dbus-sysdeps-util-unix.c",
+ "dbus-timeout.c",
+ "dbus-threads.c",
+ "dbus-transport.c",
+ "dbus-transport-socket.c",
+ "dbus-transport-unix.c",
+ "dbus-object-tree.c",
+ "dbus-userdb.c",
+ "dbus-userdb-util.c",
+ "dbus-watch.c",
+ "sd-daemon.c",
+ ],
+
+ cflags: [
+ "-DDBUS_ANDROID_LOG",
+ "-DDBUS_COMPILATION",
+ "-DANDROID_MANAGED_SOCKET",
+ "-DHAVE_MONOTONIC_CLOCK",
+ "-DDBUS_MACHINE_UUID_FILE=\\\"/etc/machine-id\\\"",
+ "-DDBUS_SYSTEM_CONFIG_FILE=\\\"/system/etc/dbus.conf\\\"",
+ "-DDBUS_SESSION_CONFIG_FILE=\\\"/system/etc/session.conf\\\"",
+ "-Wno-empty-body",
+ "-Wno-missing-field-initializers",
+ "-Wno-pointer-sign",
+ "-Wno-sign-compare",
+ "-Wno-tautological-compare",
+ "-Wno-type-limits",
+ "-Wno-unused-parameter",
+ ],
+ clang: true,
+
+ static_libs: ["libdbus-headers"],
+ export_static_lib_headers: ["libdbus-headers"],
+
+ shared_libs: [
+ "libcutils",
+ "liblog",
+ ],
+}
diff --git a/dbus/Android.mk b/dbus/Android.mk
deleted file mode 100644
index 5dc315e..0000000
--- a/dbus/Android.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-# Set to true to write libdbus logs to logcat instead of stderr
-# See also config.h to turn on verbose logs
-LOG_TO_ANDROID_LOGCAT := true
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- dbus-address.c \
- dbus-auth.c \
- dbus-bus.c \
- dbus-connection.c \
- dbus-credentials.c \
- dbus-dataslot.c \
- dbus-errors.c \
- dbus-file.c \
- dbus-file-unix.c \
- dbus-hash.c \
- dbus-internals.c \
- dbus-keyring.c \
- dbus-list.c \
- dbus-mainloop.c \
- dbus-marshal-basic.c \
- dbus-marshal-byteswap.c \
- dbus-marshal-header.c \
- dbus-marshal-recursive.c \
- dbus-marshal-validate.c \
- dbus-mempool.c \
- dbus-memory.c \
- dbus-message.c \
- dbus-misc.c \
- dbus-nonce.c \
- dbus-pending-call.c \
- dbus-pipe.c \
- dbus-pipe-unix.c \
- dbus-resources.c \
- dbus-server.c \
- dbus-server-socket.c \
- dbus-server-unix.c \
- dbus-sha.c \
- dbus-shell.c \
- dbus-signature.c \
- dbus-socket-set.c \
- dbus-socket-set-poll.c \
- dbus-spawn.c \
- dbus-string.c \
- dbus-string-util.c \
- dbus-sysdeps.c \
- dbus-sysdeps-pthread.c \
- dbus-sysdeps-unix.c \
- dbus-sysdeps-util.c \
- dbus-sysdeps-util-unix.c \
- dbus-timeout.c \
- dbus-threads.c \
- dbus-transport.c \
- dbus-transport-socket.c \
- dbus-transport-unix.c \
- dbus-object-tree.c \
- dbus-userdb.c \
- dbus-userdb-util.c \
- dbus-watch.c \
- sd-daemon.c
-
-LOCAL_C_INCLUDES+= $(LOCAL_PATH)/..
-
-LOCAL_MODULE:=libdbus
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/..
-
-LOCAL_CFLAGS+= \
- -DDBUS_COMPILATION \
- -DANDROID_MANAGED_SOCKET \
- -DHAVE_MONOTONIC_CLOCK \
- -DDBUS_MACHINE_UUID_FILE=\"/etc/machine-id\" \
- -DDBUS_SYSTEM_CONFIG_FILE=\"/system/etc/dbus.conf\" \
- -DDBUS_SESSION_CONFIG_FILE=\"/system/etc/session.conf\" \
- -Wno-empty-body \
- -Wno-missing-field-initializers \
- -Wno-pointer-sign \
- -Wno-sign-compare \
- -Wno-tautological-compare \
- -Wno-type-limits \
- -Wno-unused-parameter
-
-LOCAL_CLANG := true
-
-ifeq ($(LOG_TO_ANDROID_LOGCAT),true)
-LOCAL_CFLAGS+= -DDBUS_ANDROID_LOG
-LOCAL_SHARED_LIBRARIES+= libcutils liblog
-endif
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/tools/Android.mk b/tools/Android.mk
index aad8d63..a5d33f7 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -1,21 +1,17 @@
LOCAL_PATH := $(call my-dir)
-dbusToolsCommonCIncludes := $(LOCAL_PATH)/..
dbusToolsCommonCFlags := \
-DDBUS_COMPILATION \
-DDBUS_MACHINE_UUID_FILE=\"/etc/machine-id\" \
-Wno-unused-parameter
-dbusToolsCommonSharedLibraries := libdbus
# common
include $(CLEAR_VARS)
LOCAL_SRC_FILES := dbus-print-message.c
-LOCAL_C_INCLUDES += $(dbusToolsCommonCIncludes)
-LOCAL_SHARED_LIBRARIES += $(dbusToolsCommonSharedLibraries)
+LOCAL_SHARED_LIBRARIES += libdbus
LOCAL_CFLAGS += $(dbusToolsCommonCFlags)
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE := libdbus-tools-common
include $(BUILD_STATIC_LIBRARY)
@@ -24,8 +20,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := dbus-monitor.c
-LOCAL_C_INCLUDES += $(dbusToolsCommonCIncludes)
-LOCAL_SHARED_LIBRARIES += $(dbusToolsCommonSharedLibraries)
+LOCAL_SHARED_LIBRARIES += libdbus
LOCAL_STATIC_LIBRARIES += libdbus-tools-common
LOCAL_CFLAGS += $(dbusToolsCommonCFlags)
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
@@ -37,8 +32,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := dbus-send.c
-LOCAL_C_INCLUDES += $(dbusToolsCommonCIncludes)
-LOCAL_SHARED_LIBRARIES += $(dbusToolsCommonSharedLibraries)
+LOCAL_SHARED_LIBRARIES += libdbus
LOCAL_STATIC_LIBRARIES += libdbus-tools-common
LOCAL_CFLAGS += $(dbusToolsCommonCFlags)
LOCAL_MODULE := dbus-send
