Merge "host_init_verifier: no HIDL_INTERFACE_HIERARCHY" am: 9126041689 am: 12e476cb93

am: 47f3fa20a7

Change-Id: Iaca0ff350401b33e99f800555876f979fc051b66
This commit is contained in:
Steven Moreland 2019-10-23 16:30:28 -07:00 committed by android-build-merger
commit eaaa3e2743

View file

@ -2454,7 +2454,6 @@ ifneq ($(HOST_OS),darwin)
$(2): \
$(1) \
$(HOST_INIT_VERIFIER) \
$(HIDL_INHERITANCE_HIERARCHY) \
$(call intermediates-dir-for,ETC,passwd_system)/passwd_system \
$(call intermediates-dir-for,ETC,passwd_vendor)/passwd_vendor \
$(call intermediates-dir-for,ETC,passwd_odm)/passwd_odm \
@ -2464,7 +2463,7 @@ $(2): \
-p $(call intermediates-dir-for,ETC,passwd_vendor)/passwd_vendor \
-p $(call intermediates-dir-for,ETC,passwd_odm)/passwd_odm \
-p $(call intermediates-dir-for,ETC,passwd_product)/passwd_product \
-i $(HIDL_INHERITANCE_HIERARCHY) $$<
$$<
else
$(2): $(1)
endif