aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2019-10-23 16:13:58 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-23 16:13:58 -0700
commit12e476cb93ea0a7e8c980e1a5ea0cc66b7ea7b69 (patch)
tree8c2d7c5122c7a583dd2fe2ccb8affcffd315b190
parent30427892d795d5ceb55f8e1c2fa076e1110ced4f (diff)
parent9126041689df49114fa79a4d72402e3b888204d3 (diff)
downloadbuild-12e476cb93ea0a7e8c980e1a5ea0cc66b7ea7b69.tar.gz
Merge "host_init_verifier: no HIDL_INTERFACE_HIERARCHY"
am: 9126041689 Change-Id: If3597954a216928add218c85a5934550f7e71e95
-rw-r--r--core/definitions.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/definitions.mk b/core/definitions.mk
index a8bf4d55b9..1bf7fa9f31 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -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