Merge "Remove DBus support." (cf858d87) · Commits · e / os / android_build

core/binary.mk

+0 −56

Original line number	Diff line number	Diff line
		@@ -937,62 +937,6 @@ else
		endif
		endif # $(proto_sources) non-empty

		###########################################################
		## Compile the .dbus-xml files to c++ headers
		###########################################################
		dbus_definitions := $(filter %.dbus-xml,$(my_src_files))
		dbus_generated_headers :=
		ifneq ($(dbus_definitions),)
		my_soong_problems += dbus

		dbus_definition_paths := $(addprefix $(LOCAL_PATH)/,$(dbus_definitions))
		dbus_service_config := $(filter %dbus-service-config.json,$(my_src_files))
		dbus_service_config_path := $(addprefix $(LOCAL_PATH)/,$(dbus_service_config))

		# Mark these source files as not producing objects
		$(call track-src-file-obj,$(dbus_definitions) $(dbus_service_config),)

		dbus_gen_dir := $(generated_sources_dir)/dbus_bindings

		ifdef LOCAL_DBUS_PROXY_PREFIX
		dbus_header_dir := $(dbus_gen_dir)/include/$(LOCAL_DBUS_PROXY_PREFIX)
		dbus_headers := dbus-proxies.h
		else
		dbus_header_dir := $(dbus_gen_dir)
		dbus_headers := $(patsubst %.dbus-xml,%.h,$(dbus_definitions))
		endif
		dbus_generated_headers := $(addprefix $(dbus_header_dir)/,$(dbus_headers))

		# Ensure that we only define build rules once in multilib builds.
		ifndef $(my_prefix)_$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_dbus_bindings_defined
		$(my_prefix)_$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_dbus_bindings_defined := true

		$(dbus_generated_headers): PRIVATE_MODULE := $(LOCAL_MODULE)
		$(dbus_generated_headers): PRIVATE_DBUS_SERVICE_CONFIG := $(dbus_service_config_path)
		$(dbus_generated_headers) : $(dbus_service_config_path) $(DBUS_GENERATOR)
		ifdef LOCAL_DBUS_PROXY_PREFIX
		$(dbus_generated_headers) : $(dbus_definition_paths)
		$(generate-dbus-proxies)
		else
		$(dbus_generated_headers) : $(dbus_header_dir)/%.h : $(LOCAL_PATH)/%.dbus-xml
		$(generate-dbus-adaptors)
		endif # $(LOCAL_DBUS_PROXY_PREFIX)
		endif # $(my_prefix)_$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_dbus_bindings_defined

		ifdef LOCAL_DBUS_PROXY_PREFIX
		# Auto-export the generated dbus proxy directory.
		my_export_c_include_dirs += $(dbus_gen_dir)/include
		my_c_includes += $(dbus_gen_dir)/include
		else
		my_export_c_include_dirs += $(dbus_header_dir)
		my_c_includes += $(dbus_header_dir)
		endif # $(LOCAL_DBUS_PROXY_PREFIX)

		my_generated_sources += $(dbus_generated_headers)

		endif # $(dbus_definitions) non-empty


		###########################################################
		## AIDL: Compile .aidl files to .cpp and .h files
		###########################################################

core/clear_vars.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ LOCAL_CTS_TEST_RUNNER:=
		LOCAL_CXX:=
		LOCAL_CXX_STL := default
		LOCAL_DATA_BINDING:=
		LOCAL_DBUS_PROXY_PREFIX:=
		LOCAL_DEX_PREOPT_APP_IMAGE:=
		LOCAL_DEX_PREOPT_FLAGS:=
		LOCAL_DEX_PREOPT_GENERATE_PROFILE:=

core/config.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -566,7 +566,6 @@ NANOPB_SRCS := external/nanopb-c/generator/protoc-gen-nanopb \
		external/nanopb-c/generator/google/*.py \
		external/nanopb-c/generator/proto/*.py)
		VTSC := $(HOST_OUT_EXECUTABLES)/vtsc$(HOST_EXECUTABLE_SUFFIX)
		DBUS_GENERATOR := $(HOST_OUT_EXECUTABLES)/dbus-binding-generator
		MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX)
		MINIGZIP := $(HOST_OUT_EXECUTABLES)/minigzip$(HOST_EXECUTABLE_SUFFIX)
		ifeq (,$(strip $(BOARD_CUSTOM_MKBOOTIMG)))

core/definitions.mk

+0 −25

Original line number	Diff line number	Diff line
		@@ -1196,31 +1196,6 @@ $(if $(PRIVATE_RENAME_CPP_EXT),\
		$(hide) mv $(basename $@).cc $@)
		endef


		######################################################################
		## Commands for generating DBus adaptors from .dbus-xml files.
		######################################################################
		define generate-dbus-adaptors
		@echo "Generating DBus adaptors for $(PRIVATE_MODULE)"
		@mkdir -p $(dir $@)
		$(hide) $(DBUS_GENERATOR) \
		--service-config=$(PRIVATE_DBUS_SERVICE_CONFIG) \
		--adaptor=$@ \
		$<
		endef

		######################################################################
		## Commands for generating DBus proxies from .dbus-xml files.
		######################################################################
		define generate-dbus-proxies
		@echo "Generating DBus proxies for $(PRIVATE_MODULE)"
		@mkdir -p $(dir $@)
		$(hide) $(DBUS_GENERATOR) \
		--service-config=$(PRIVATE_DBUS_SERVICE_CONFIG) \
		--proxy=$@ \
		$(filter %.dbus-xml,$^)
		endef

		###########################################################
		## Helper to set include paths form transform-*-to-o
		###########################################################

tools/soong_to_convert.py

+0 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ that Make can detect are listed in parenthesis after the module:
		dotdot_incs: LOCAL_C_INCLUDES contains paths include '..'
		srcs_dotarm: LOCAL_SRC_FILES contains source files like <...>.c.arm
		aidl: LOCAL_SRC_FILES contains .aidl sources
		dbus: LOCAL_SRC_FILES contains .dbus-xml sources
		objc: LOCAL_SRC_FILES contains Objective-C sources
		proto: LOCAL_SRC_FILES contains .proto sources
		rs: LOCAL_SRC_FILES contains renderscript sources