Merge "host_init_verifier: no HIDL_INTERFACE_HIERARCHY"

This commit is contained in:
Steven Moreland
2019-10-23 23:07:30 +00:00
committed by Gerrit Code Review

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