StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Shrink Mac builds" am: f478b8487b am: e666d6bf1a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1860157

Change-Id: Ic631807b15aa8310dbe06d3db413876646b95b31
This commit is contained in:
Dan Willemsen
2021-10-19 00:47:10 +00:00
committed by Automerger Merge Worker
parent d4566b9d31 e666d6bf1a
commit 67dd4bb8f0
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/main.mk
View File

@@ -534,7 +534,12 @@ FULL_BUILD := true
# Include all of the makefiles in the system # Include all of the makefiles in the system
# #
subdir_makefiles := $(SOONG_ANDROID_MK) $(file <$(OUT_DIR)/.module_paths/Android.mk.list) $(SOONG_OUT_DIR)/late-$(TARGET_PRODUCT).mk subdir_makefiles := $(SOONG_ANDROID_MK)
# Android.mk files are only used on Linux builds, Mac only supports Android.bp
ifeq ($(HOST_OS),linux)
subdir_makefiles += $(file <$(OUT_DIR)/.module_paths/Android.mk.list)
endif
subdir_makefiles += $(SOONG_OUT_DIR)/late-$(TARGET_PRODUCT).mk
subdir_makefiles_total := $(words int $(subdir_makefiles) post finish) subdir_makefiles_total := $(words int $(subdir_makefiles) post finish)
.KATI_READONLY := subdir_makefiles_total .KATI_READONLY := subdir_makefiles_total
@@ -1310,7 +1315,11 @@ $(if $(strip $(1)), \
) )
endef endef
ifdef FULL_BUILD ifeq ($(HOST_OS),darwin)
# Target builds are not supported on Mac
product_target_FILES :=
product_host_FILES := $(call host-installed-files,$(INTERNAL_PRODUCT))
else ifdef FULL_BUILD
ifneq (true,$(ALLOW_MISSING_DEPENDENCIES)) ifneq (true,$(ALLOW_MISSING_DEPENDENCIES))
# Check to ensure that all modules in PRODUCT_PACKAGES exist (opt in per product) # Check to ensure that all modules in PRODUCT_PACKAGES exist (opt in per product)
ifeq (true,$(PRODUCT_ENFORCE_PACKAGES_EXIST)) ifeq (true,$(PRODUCT_ENFORCE_PACKAGES_EXIST))
@@ -1466,7 +1475,9 @@ endif
# 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
# extends ALL_DEFAULT_INSTALLED_MODULES. # extends ALL_DEFAULT_INSTALLED_MODULES.
ALL_DEFAULT_INSTALLED_MODULES := $(modules_to_install) ALL_DEFAULT_INSTALLED_MODULES := $(modules_to_install)
ifeq ($(HOST_OS),linux)
include $(BUILD_SYSTEM)/Makefile include $(BUILD_SYSTEM)/Makefile
endif
modules_to_install := $(sort $(ALL_DEFAULT_INSTALLED_MODULES)) modules_to_install := $(sort $(ALL_DEFAULT_INSTALLED_MODULES))
ALL_DEFAULT_INSTALLED_MODULES := ALL_DEFAULT_INSTALLED_MODULES :=
@@ -1687,7 +1698,11 @@ ifeq ($(SOONG_COLLECT_JAVA_DEPS), true)
endif endif
.PHONY: apps_only .PHONY: apps_only
ifneq ($(TARGET_BUILD_APPS),) ifeq ($(HOST_OS),darwin)
# Mac only supports building host modules
droid_targets: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) dist_files
else ifneq ($(TARGET_BUILD_APPS),)
# If this build is just for apps, only build apps and not the full system by default. # If this build is just for apps, only build apps and not the full system by default.
unbundled_build_modules := unbundled_build_modules :=