Merge "Uses the KNOWN_HIDL_INTERFACES file in host_init_verifier."

am: 28142690ba

Change-Id: Ibf879b8eeaab7de8fbe667a441dc7879815ac495
This commit is contained in:
Daniel Norman 2019-07-01 14:59:23 -07:00 committed by android-build-merger
commit c3443e59a6
1 changed files with 6 additions and 2 deletions

View File

@ -2449,8 +2449,12 @@ endef
define copy-init-script-file-checked
# Host init verifier doesn't exist on darwin.
ifneq ($(HOST_OS),darwin)
$(2): $(1) $(HOST_INIT_VERIFIER) $(call intermediates-dir-for,ETC,passwd)/passwd
$(hide) $(HOST_INIT_VERIFIER) -p $(call intermediates-dir-for,ETC,passwd)/passwd $$<
$(2): \
$(1) \
$(HOST_INIT_VERIFIER) \
$(KNOWN_HIDL_INTERFACES) \
$(call intermediates-dir-for,ETC,passwd)/passwd
$(hide) $(HOST_INIT_VERIFIER) -p $(call intermediates-dir-for,ETC,passwd)/passwd -k $(KNOWN_HIDL_INTERFACES) $$<
else
$(2): $(1)
endif