From 71c58092f4e8ac2eb5d03569049831c0f122fca7 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Wed, 23 Mar 2016 11:02:03 -0700
Subject: [PATCH] Phony target $(LOCAL_MODULE) covers all multilib variants.

Bug: 27760875
Change-Id: Ie59e2c36964fa736b17fb4185563c08a8cb75b80
---
 core/base_rules.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 5afec2f45..5606896f0 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -286,6 +286,12 @@ $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MODULE:= $(my_register_name)
 .PHONY: $(my_register_name)
 $(my_register_name): $(LOCAL_BUILT_MODULE) $(LOCAL_INSTALLED_MODULE)
 
+ifneq ($(my_register_name),$(LOCAL_MODULE))
+# $(LOCAL_MODULE) covers all the multilib targets.
+.PHONY: $(LOCAL_MODULE)
+$(LOCAL_MODULE) : $(my_register_name)
+endif
+
 # Set up phony targets that covers all modules under the given paths.
 # This allows us to build everything in given paths by running mmma/mma.
 my_path_components := $(subst /,$(space),$(LOCAL_PATH))
-- 
2.11.0