Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
diff --git a/core/main.mk b/core/main.mk
index ba67189..d424b25 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -417,8 +417,6 @@
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 @@
else # ONE_SHOT_MAKEFILE
+ifneq ($(dont_bother),true)
#
# Include all of the makefiles in the system
#
@@ -490,6 +489,8 @@
$(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.
@@ -519,16 +520,6 @@
# All module makefiles have been included at this point.
# -------------------------------------------------------------------
-# -------------------------------------------------------------------
-# Include any makefiles that must happen after the module makefiles
-# have been included.
-# TODO: have these files register themselves via a global var rather
-# than hard-coding the list here.
-ifdef FULL_BUILD
- # Only include this during a full build, otherwise we can't be
- # guaranteed that any policies were included.
- -include frameworks/policies/base/PolicyConfig.mk
-endif
# -------------------------------------------------------------------
# Fix up CUSTOM_MODULES to refer to installed files rather than
@@ -682,8 +673,6 @@
$(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