commit 5352018b0b115061bce7a2aac14780ffea3885c7
author Tim Murray <timmurray@google.com> Mon Feb 03 22:35:54 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 03 22:35:54 2014 +0000
tree e5ae49c289b163392b39585e9dfff448fd025c05
parent a77456b8e8a5e66705e48e1ec4eebc1889553c6a
parent f6752d303f6e133dc7bf3c2a252e8b6c51de83ff

Merge "Add new rs directory to list of Java subdirs of fw/base."

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index e2b93c2..b593acd 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -582,6 +582,8 @@
     $(eval h_m := $(filter $(HOST_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \
     $(eval t_r := $(filter $(TARGET_OUT_ROOT)/%, $(r))) \
     $(eval h_r := $(filter $(HOST_OUT_ROOT)/%, $(r))) \
+    $(eval t_m := $(filter-out $(t_r), $(t_m))) \
+    $(eval h_m := $(filter-out $(h_r), $(h_m))) \
     $(if $(t_m), $(eval $(call add-required-deps, $(t_m),$(t_r)))) \
     $(if $(h_m), $(eval $(call add-required-deps, $(h_m),$(h_r)))) \
    ) \