Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20ef354e authored by Ying Wang's avatar Ying Wang
Browse files

Load the ONE_SHOT_MAKEFILE even in dont_bother mode 

This makes "mmm <path> snod" work again.
Note that snod has dependency on the rest of the command line goals,
which is all_modules for ONE_SHOT_MAKEFILE,
so build race condition is avoided.

Change-Id: Ib0c0e622530cde773180a095e5ec4dde1149b8e5
parent 39e08f28

core/main.mk

+3 −4
Original line number Diff line number Diff line
@@ -417,8 +417,6 @@ $(INTERNAL_MODIFIER_TARGETS): $(DEFAULT_GOAL) 
endif



# Bring in all modules that need to be built.

ifneq ($(dont_bother),true)



ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)

SDK_ONLY := true

$(info Building the SDK under darwin-ppc is actually obsolete and unsupported.)
@@ -479,6 +477,7 @@ GET-INSTALL-PATH: 


else # ONE_SHOT_MAKEFILE



ifneq ($(dont_bother),true)

#

# Include all of the makefiles in the system

#
@@ -490,6 +489,8 @@ subdir_makefiles := \ 


$(foreach mk, $(subdir_makefiles), $(info including $(mk) ...)$(eval include $(mk)))



endif # dont_bother



endif # ONE_SHOT_MAKEFILE



# Now with all Android.mks loaded we can do post cleaning steps.
@@ -672,8 +673,6 @@ ifdef is_sdk_build 
      $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_TESTS has nothing to install!)))

endif



endif # dont_bother



# build/core/Makefile contains extra stuff that we don't want to pollute this

# top-level makefile with.  It expects that ALL_DEFAULT_INSTALLED_MODULES

# contains everything that's built during the current make, but it also further