From 54e92d0061848ba973760d78e6cce3b95ef7f055 Mon Sep 17 00:00:00 2001 From: Gilad Arnold Date: Thu, 6 Aug 2015 12:50:23 -0700 Subject: [PATCH] Remove LOCAL_MODULE from generated DBus header path. Its presence requires #include directives to contain the build target name, which is problematic because these directives can live in headers that are shared by multiple build targets. Furthermore, having LOCAL_MODULE in the generated header path is redundant because the target directory is already private to the current build target (e.g. .../_intermediates/...). Bug: 22608897 Change-Id: I059f71a1231e80f89c99441794a4491f2685036f --- core/binary.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/binary.mk b/core/binary.mk index f300b2f2d..33afb6d58 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -579,7 +579,7 @@ dbus_if_sources_full_path := $(addprefix $(LOCAL_PATH)/,$(dbus_if_sources)) dbus_service_config := $(filter %dbus-service-config.json,$(my_src_files)) dbus_service_config_full_path := $(addprefix $(LOCAL_PATH)/,$(dbus_service_config)) -dbus_header_prefix := $(generated_sources_dir)/dbus-bindings/$(LOCAL_MODULE) +dbus_header_prefix := $(generated_sources_dir)/dbus_bindings dbus_adaptors_header := $(dbus_header_prefix)/adaptors.h dbus_proxies_header := $(dbus_header_prefix)/proxies.h dbus_method_names_header := $(dbus_header_prefix)/method_names.h