Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7288a632 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "host_init_verifier: no HIDL_INTERFACE_HIERARCHY" am: 91260416 am:...

Merge "host_init_verifier: no HIDL_INTERFACE_HIERARCHY" am: 91260416 am: 12e476cb am: 47f3fa20
am: eaaa3e27

Change-Id: Ib41d10762fb96614ca5d3cfd23862e6b32c1ef4c
parents 9cbd1249 eaaa3e27
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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