Merge "host_init_verifier: no HIDL_INTERFACE_HIERARCHY"

am: 9126041689

Change-Id: If3597954a216928add218c85a5934550f7e71e95
This commit is contained in:
Steven Moreland
2019-10-23 16:13:58 -07:00
committed by android-build-merger

View File

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