commit 901e5ac899fb2642ea16ebdccca103792e054826
author Dan Willemsen <dwillemsen@google.com> Thu Apr 20 23:33:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 20 23:33:24 2017 +0000
tree 78584151f4f3744ab6975d653ef6b477ca2f887c
parent eac1397cc3ec3f9c95a2475c1fd78e916db4072b
parent a637a59b7eb06bbfed7023897a5e74bc512db7cf

Merge "link_type: common overrides 2nd"
am: a637a59b7e

Change-Id: I93f30dd9fb1b56ae10f3acc5279c7a2bbd52b6e2

core/link_type.mk

diff --git a/core/link_type.mk b/core/link_type.mk
index ed12566..ff525cb 100644
--- a/core/link_type.mk
+++ b/core/link_type.mk
@@ -10,7 +10,7 @@
 #   my_link_deps: the dependencies, in the form of <MODULE_CLASS>:<name>
 #
 
-my_link_prefix := LINK_TYPE:$(call find-idf-prefix,$(my_kind),$(my_host_cross)):$(if $(my_common),$(my_common),_):$(if $(my_2nd_arch_prefix),$(my_2nd_arch_prefix),_)
+my_link_prefix := LINK_TYPE:$(call find-idf-prefix,$(my_kind),$(my_host_cross)):$(if $(my_common),$(my_common):_,_:$(if $(my_2nd_arch_prefix),$(my_2nd_arch_prefix),_))
 link_type := $(my_link_prefix):$(LOCAL_MODULE_CLASS):$(LOCAL_MODULE)
 ALL_LINK_TYPES := $(ALL_LINK_TYPES) $(link_type)
 $(link_type).TYPE := $(my_link_type)