commit 70b67accbfb80c9d238c7b2121f3ba6d1691e2b0
author Siva Velusamy <vsiva@google.com> Mon May 18 12:02:26 2015 -0700
committer Bo Hu <bohu@google.com> Mon May 18 23:14:18 2015 +0000
tree 14242e459946800f3f27eb314eb22bd2dfb10cc6
parent 1dadfec6e02cc362ed36e7e39b7cc49b6a00731d

Don't exclude GPL binaries from the emulator system image

GPL binaries are allowed on device and emulator as well

b/20341087

Change-Id: I777dccd0d5442ae2cd0b7e222f6a9beaa3648c37

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 5ee0ec1..0fbcc14 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -750,6 +750,7 @@
                       $(TARGET_OUT)/% \
                       $(TARGET_OUT_DATA)/%, \
                               $(sort $(call get-tagged-modules,gnu)))
+  target_gnu_MODULES := $(filter-out $(TARGET_OUT_EXECUTABLES)/%,$(target_gnu_MODULES))
   $(info Removing from sdk:)$(foreach d,$(target_gnu_MODULES),$(info : $(d)))
   modules_to_install := \
               $(filter-out $(target_gnu_MODULES),$(modules_to_install))