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

Commit c7b610a6 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Read Soong-exported configuration"

parents f100d01d 8b999ac6

core/main.mk

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ $(shell mkdir -p $(OUT_DIR) && touch $(OUT_DIR)/ninja_build) 
include build/core/ninja.mk

else # KATI



include $(SOONG_MAKEVARS_MK)



# Write the build number to a file so it can be read back in

# without changing the command line every time.  Avoids rebuilds

# when using ninja.

core/ninja.mk

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ ifeq ($(KATI_EMULATE_FIND),false) 
endif

$(KATI_BUILD_NINJA): $(CKATI) $(MAKEPARALLEL) $(DUMMY_OUT_MKS) run_soong FORCE

	@echo Running kati to generate build$(KATI_NINJA_SUFFIX).ninja...

	+$(hide) $(KATI_MAKEPARALLEL) $(CKATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --no_ignore_dirty=$(SOONG_ANDROID_MK) --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo $(KATI_FIND_EMULATOR) -f build/core/main.mk $(KATI_GOALS) --gen_all_targets BUILDING_WITH_NINJA=true SOONG_ANDROID_MK=$(SOONG_ANDROID_MK)

	+$(hide) $(KATI_MAKEPARALLEL) $(CKATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --no_ignore_dirty=$(SOONG_ANDROID_MK) --no_ignore_dirty=$(SOONG_MAKEVARS_MK) --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo $(KATI_FIND_EMULATOR) -f build/core/main.mk $(KATI_GOALS) --gen_all_targets BUILDING_WITH_NINJA=true SOONG_ANDROID_MK=$(SOONG_ANDROID_MK) SOONG_MAKEVARS_MK=$(SOONG_MAKEVARS_MK)



.PHONY: FORCE

FORCE:

core/soong.mk

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ SOONG := $(SOONG_OUT_DIR)/soong 
SOONG_BOOTSTRAP := $(SOONG_OUT_DIR)/.soong.bootstrap

SOONG_BUILD_NINJA := $(SOONG_OUT_DIR)/build.ninja

SOONG_IN_MAKE := $(SOONG_OUT_DIR)/.soong.in_make

SOONG_MAKEVARS_MK := $(SOONG_OUT_DIR)/make_vars-$(TARGET_PRODUCT).mk

SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.variables



# Only include the Soong-generated Android.mk if we're merging the