tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 20ef354e: Load the ONE_SHOT_MAKEFILE even in dont_bother mode

Browse source 
* commit '20ef354e8c3a1fc10515a469fcc615935e6fb7cb':
  Load the ONE_SHOT_MAKEFILE even in dont_bother mode
This commit is contained in:
Ying Wang 2013-09-09 12:17:20 -07:00 committed by Android Git Automerger
commit 061b89c0bf
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/main.mk
View file

@ -417,8 +417,6 @@ $(INTERNAL_MODIFIER_TARGETS): $(DEFAULT_GOAL)
endif endif
# Bring in all modules that need to be built. # Bring in all modules that need to be built.
ifneq ($(dont_bother),true)
ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc) ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
SDK_ONLY := true SDK_ONLY := true
$(info Building the SDK under darwin-ppc is actually obsolete and unsupported.) $(info Building the SDK under darwin-ppc is actually obsolete and unsupported.)
@ -479,6 +477,7 @@ GET-INSTALL-PATH:
else # ONE_SHOT_MAKEFILE else # ONE_SHOT_MAKEFILE
ifneq ($(dont_bother),true)
# #
# Include all of the makefiles in the system # Include all of the makefiles in the system
# #
@ -490,6 +489,8 @@ subdir_makefiles := \
$(foreach mk, $(subdir_makefiles), $(info including $(mk) ...)$(eval include $(mk))) $(foreach mk, $(subdir_makefiles), $(info including $(mk) ...)$(eval include $(mk)))
endif # dont_bother
endif # ONE_SHOT_MAKEFILE endif # ONE_SHOT_MAKEFILE
# Now with all Android.mks loaded we can do post cleaning steps. # 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!))) $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_TESTS has nothing to install!)))
endif endif
endif # dont_bother
# build/core/Makefile contains extra stuff that we don't want to pollute this # 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 # top-level makefile with. It expects that ALL_DEFAULT_INSTALLED_MODULES
# contains everything that's built during the current make, but it also further # contains everything that's built during the current make, but it also further