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

Commit bd4239a1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use CALLED_FROM_SETUP instead of KATI"

parents 60e1f8ee 20f99a60

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ combo_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX) 
include $(BUILD_SYSTEM)/combo/select.mk

endif



ifndef KATI

ifeq ($(CALLED_FROM_SETUP),true)

include $(BUILD_SYSTEM)/ccache.mk

include $(BUILD_SYSTEM)/goma.mk
@@ -900,7 +900,7 @@ dont_bother_goals := out \ 
    vbmetaimage-nodeps \

    product-graph dump-products



ifndef KATI

ifeq ($(CALLED_FROM_SETUP),true)

include $(BUILD_SYSTEM)/ninja_config.mk

include $(BUILD_SYSTEM)/soong_config.mk

endif

core/envsetup.mk

+1 −1
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ ifeq (,$(strip $(DIST_DIR))) 
  DIST_DIR := $(OUT_DIR)/dist

endif



ifndef KATI

ifeq ($(CALLED_FROM_SETUP),true)

PRINT_BUILD_CONFIG ?= true

endif

core/product_config.mk

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ INTERNAL_VALID_VARIANTS := user userdebug eng 
# Provide "PRODUCT-<prodname>-<goal>" targets, which lets you build

# a particular configuration without needing to set up the environment.

#

ifndef KATI

ifeq ($(CALLED_FROM_SETUP),true)

product_goals := $(strip $(filter PRODUCT-%,$(MAKECMDGOALS)))

ifdef product_goals

  # Scrape the product and build names out of the goal,
@@ -129,14 +129,14 @@ ifdef product_goals 
  # position, in case it matters.

  override MAKECMDGOALS := $(patsubst $(goal_name),$(default_goal_substitution),$(MAKECMDGOALS))

endif

endif # !KATI

endif # CALLED_FROM_SETUP

# else: Use the value set in the environment or buildspec.mk.



# ---------------------------------------------------------------

# Provide "APP-<appname>" targets, which lets you build

# an unbundled app.

#

ifndef KATI

ifeq ($(CALLED_FROM_SETUP),true)

unbundled_goals := $(strip $(filter APP-%,$(MAKECMDGOALS)))

ifdef unbundled_goals

  ifneq ($(words $(unbundled_goals)),1)