Merge "Add more module targets for host, host-cross, host32, host64" am: 77ea32f378 am: 3ae5fc64bf

am: 06699bbd7d

Change-Id: Ia49441e96dc0a3cbe7dda898698fd774d18fbe48
This commit is contained in:
Colin Cross 2016-12-09 23:11:21 +00:00 committed by android-build-merger
commit 327fced920

View file

@ -553,16 +553,26 @@ endif
endif
ifdef LOCAL_IS_HOST_MODULE
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
h_or_hc_or_t := target
h_or_t := target
endif
ifdef j_or_n
$(j_or_n) $(h_or_t) $(j_or_n)-$(h_or_t) : $(my_checked_module)
ifneq (,$(filter $(my_module_tags),tests))
$(j_or_n)-$(h_or_t)-tests $(j_or_n)-tests $(h_or_t)-tests : $(my_checked_module)
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
###########################################################