Merge "Add more module targets for host, host-cross, host32, host64" am: 77ea32f378 am: 3ae5fc64bf (327fced9) · Commits · e / os / android_build

core/base_rules.mk

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -553,16 +553,26 @@ endif
	endif		endif
	ifdef LOCAL_IS_HOST_MODULE		ifdef LOCAL_IS_HOST_MODULE
	h_or_t := host		h_or_t := host
			ifeq ($(my_host_cross),true)
			h_or_hc_or_t := host-cross
			else
			h_or_hc_or_t := host
			endif
	else		else
			h_or_hc_or_t := target
	h_or_t := target		h_or_t := target
	endif		endif


	ifdef j_or_n		ifdef j_or_n
	$(j_or_n) $(h_or_t) $(j_or_n)-$(h_or_t) : $(my_checked_module)		$(j_or_n) $(h_or_t) $(j_or_n)-$(h_or_t) : $(my_checked_module)
	ifneq (,$(filter $(my_module_tags),tests))		ifneq (,$(filter $(my_module_tags),tests))
	$(j_or_n)-$(h_or_t)-tests $(j_or_n)-tests $(h_or_t)-tests : $(my_checked_module)		$(j_or_n)-$(h_or_t)-tests $(j_or_n)-tests $(h_or_t)-tests : $(my_checked_module)
	endif		endif
	$(LOCAL_MODULE)-$(h_or_t) : $(my_all_targets)		$(LOCAL_MODULE)-$(h_or_hc_or_t) : $(my_all_targets)
			ifeq ($(j_or_n),native)
			$(LOCAL_MODULE)-$(h_or_hc_or_t)$(my_32_64_bit_suffix) : $(my_all_targets)
			endif
	endif		endif

	###########################################################		###########################################################