commit d6b1d61d84a95ba74bb3e4f9053014357ac363d1
author Ying Wang <wangying@google.com> Mon Apr 15 17:32:21 2013 -0700
committer Ying Wang <wangying@google.com> Mon Apr 15 17:41:55 2013 -0700
tree b06d6a1d354f605707e786019e6d96df3d9c0c6f
parent 021aa4cefe03fd7cca5ee4baf25a562c6f6cda20

Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES

Since commit 6c86a1 we have split LOCAL_SHARED_LIBRARIES out of
LOCAL_REQUIRED_MODULES and the vendor check does no longer cover the
installed modules introduced by LOCAL_SHARED_LIBRARIES.
This change brings back the coverage.

Change-Id: Ie78692e48f173a3350792eb2fee8127ff9433caa

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 49e0a9a..e03801c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -556,12 +556,12 @@
   $(eval p := $(subst :,$(space),$(m))) \
   $(eval r := $(filter $(TARGET_OUT_ROOT)/%,$(call module-installed-files,\
     $(subst $(comma),$(space),$(lastword $(p)))))) \
-  $(eval $(call add-required-deps,$(firstword $(p)),$(r))))
+  $(eval $(call add-required-deps,$(word 2,$(p)),$(r))))
 $(foreach m,$(HOST_DEPENDENCIES_ON_SHARED_LIBRARIES), \
   $(eval p := $(subst :,$(space),$(m))) \
   $(eval r := $(filter $(HOST_OUT_ROOT)/%,$(call module-installed-files,\
     $(subst $(comma),$(space),$(lastword $(p)))))) \
-  $(eval $(call add-required-deps,$(firstword $(p)),$(r))))
+  $(eval $(call add-required-deps,$(word 2,$(p)),$(r))))
 
 m :=
 r :=