commit c478ea3dac008d86578f00c368bc58d2c94ad7b1
author Dan Willemsen <dwillemsen@google.com> Thu Mar 07 17:18:15 2019 -0800
committer Dan Willemsen <dwillemsen@google.com> Thu Mar 07 17:18:15 2019 -0800
tree 531de66389fde2a7569d046fbb38f489a79408ed
parent 066da0c58bedab6aaf57136d9f5eded057435f34

Fix `m snod`

Whenever we're not loading all makefiles, we shouldn't be checking that
all the host packages exist.

Test: m snod
Change-Id: If1f817d855cbe329b83caee9fdd68c2cce55f02b

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 6752595..5d97027 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1149,21 +1149,21 @@
     $(INTERNAL_PRODUCT) includes redundant whitelist entries for nonexistant PRODUCT_PACKAGES)
 endif
 
-# Check to ensure that all modules in PRODUCT_HOST_PACKAGES exist
-#
-# Many host modules are Linux-only, so skip this check on Mac. If we ever have Mac-only modules,
-# maybe it would make sense to have PRODUCT_HOST_PACKAGES_LINUX/_DARWIN?
-ifneq ($(HOST_OS),darwin)
-  ifneq (true,$(ALLOW_MISSING_DEPENDENCIES))
-    _modules := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_HOST_PACKAGES)
-    _nonexistant_modules := $(foreach m,$(_modules),\
-      $(if $(filter FAKE,$(ALL_MODULES.$(m).CLASS))$(filter $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,$(m)))
-    $(call maybe-print-list-and-error,$(_nonexistant_modules),\
-      $(INTERNAL_PRODUCT) includes non-existant modules in PRODUCT_HOST_PACKAGES)
-  endif
-endif
-
 ifdef FULL_BUILD
+  # Check to ensure that all modules in PRODUCT_HOST_PACKAGES exist
+  #
+  # Many host modules are Linux-only, so skip this check on Mac. If we ever have Mac-only modules,
+  # maybe it would make sense to have PRODUCT_HOST_PACKAGES_LINUX/_DARWIN?
+  ifneq ($(HOST_OS),darwin)
+    ifneq (true,$(ALLOW_MISSING_DEPENDENCIES))
+      _modules := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_HOST_PACKAGES)
+      _nonexistant_modules := $(foreach m,$(_modules),\
+        $(if $(filter FAKE,$(ALL_MODULES.$(m).CLASS))$(filter $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,$(m)))
+      $(call maybe-print-list-and-error,$(_nonexistant_modules),\
+        $(INTERNAL_PRODUCT) includes non-existant modules in PRODUCT_HOST_PACKAGES)
+    endif
+  endif
+
   product_host_FILES := $(call host-installed-files,$(INTERNAL_PRODUCT))
   product_target_FILES := $(call product-installed-files, $(INTERNAL_PRODUCT))
   # WARNING: The product_MODULES variable is depended on by external files.
@@ -1254,6 +1254,7 @@
   # requested by the product, because we probably won't have rules
   # to build them.
   product_target_FILES :=
+  product_host_FILES :=
 endif
 
 # TODO: Remove the 3 places in the tree that use ALL_DEFAULT_INSTALLED_MODULES