commit ac079b1da45431197cc9d821bf2234d2e65f28a9
author Eino-Ville Talvala <etalvala@google.com> Wed Sep 25 01:09:20 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 25 01:09:20 2013 +0000
tree ba7a9dfdaedc13039cfc91cfa5915129395e01e3
parent f47d5802e627bf14cecc425b8c3e00e001c0f7c2
parent 735bba8be0511fc3b6b023eff0605d9bf4b30477

Merge "Add android-ex-camera2 static java library to PDK." into klp-dev

core/tasks/vendor_module_check.mk

diff --git a/core/tasks/vendor_module_check.mk b/core/tasks/vendor_module_check.mk
index fcf2bbe..add889a 100644
--- a/core/tasks/vendor_module_check.mk
+++ b/core/tasks/vendor_module_check.mk
@@ -85,10 +85,11 @@
 
 $(foreach m, $(_vendor_check_modules), \
   $(if $(filter vendor/%, $(ALL_MODULES.$(m).PATH)),\
-    $(if $(filter $(TARGET_OUT_VENDOR)/%, $(ALL_MODULES.$(m).INSTALLED)),,\
-      $(error Error: vendor module "$(m)" in $(ALL_MODULES.$(m).PATH) \
-        in product "$(TARGET_PRODUCT)" being installed to \
-        $(ALL_MODULES.$(m).INSTALLED) which is not in the vendor tree))))
+    $(if $(filter-out FAKE, $(ALL_MODULES.$(m).CLASS)),\
+      $(if $(filter $(TARGET_OUT_VENDOR)/%, $(ALL_MODULES.$(m).INSTALLED)),,\
+        $(error Error: vendor module "$(m)" in $(ALL_MODULES.$(m).PATH) \
+          in product "$(TARGET_PRODUCT)" being installed to \
+          $(ALL_MODULES.$(m).INSTALLED) which is not in the vendor tree)))))
 
 endif