Make FULL_BUILD not set for the dont_bother case.
If dont_bother is set, we're not going to read all the module makefiles,
so the checks gated behind FULL_BUILD will fail.
Test: lunch mainline_system_arm64; m vnod
Change-Id: Ic7842f772edd6b6a6fdc427d018ea1dfe3cbfdbf
diff --git a/core/main.mk b/core/main.mk
index 5eebe1e..9f109aa 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -406,7 +406,6 @@
# Typical build; include any Android.mk files we can find.
#
-FULL_BUILD := true
# Before we go and include all of the module makefiles, mark the PRODUCT_*
# and ADDITIONAL*PROPERTIES values readonly so that they won't be modified.
@@ -423,6 +422,7 @@
endif
subdir_makefiles_inc := .
+FULL_BUILD :=
ifneq ($(ONE_SHOT_MAKEFILE),)
# We've probably been invoked by the "mm" shell function
@@ -434,7 +434,6 @@
# so that the modules will be installed in the same place they
# would have been with a normal make.
CUSTOM_MODULES := $(sort $(call get-tagged-modules,$(ALL_MODULE_TAGS)))
-FULL_BUILD :=
# A helper goal printing out install paths
define register_module_install_path
@@ -463,6 +462,7 @@
else # ONE_SHOT_MAKEFILE
ifneq ($(dont_bother),true)
+FULL_BUILD := true
#
# Include all of the makefiles in the system
#