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

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

Merge "Stop passing DIST_DIR to Soong"

parents b4b876f6 3e8eb377

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1921,7 +1921,7 @@ define build-systemimage-target 
      build/make/tools/releasetools/build_image.py \

      $(TARGET_OUT) $(systemimage_intermediates)/system_image_info.txt $(1) $(TARGET_OUT) \

      $(systemimage_intermediates)/generated_system_image_info.txt \

      || ( mkdir -p $$(DIST_DIR); cp $(INSTALLED_FILES_FILE) $$(DIST_DIR)/installed-files-rescued.txt; \

      || ( mkdir -p $${DIST_DIR}; cp $(INSTALLED_FILES_FILE) $${DIST_DIR}/installed-files-rescued.txt; \

           exit 1 )

endef

core/config.mk

+4 −11
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ include $(BUILD_SYSTEM_COMMON)/core.mk 
# as readonly

.KATI_READONLY := OUT_DIR TMPDIR BUILD_DATETIME_FILE

ifdef CALLED_FROM_SETUP

  .KATI_READONLY := CALLED_FROM_SETUP DIST_DIR

  .KATI_READONLY := CALLED_FROM_SETUP

endif

ifdef KATI_PACKAGE_MK_DIR

  .KATI_READONLY := KATI_PACKAGE_MK_DIR
@@ -89,26 +89,19 @@ $(KATI_obsolete_var \ 
  TARGET_NDK_GCC_VERSION 2ND_TARGET_NDK_GCC_VERSION \

  GLOBAL_CFLAGS_NO_OVERRIDE GLOBAL_CPPFLAGS_NO_OVERRIDE \

  ,GCC support has been removed. Use Clang instead)

$(KATI_obsolete_var DIST_DIR dist_goal,Use dist-for-goals instead. See $(CHANGES_URL)#dist)



# This is marked as obsolete in envsetup.mk after reading the BoardConfig.mk

$(KATI_deprecate_export It is a global setting. See $(CHANGES_URL)#export_keyword)



CHANGES_URL :=



# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE

FORCE:



ORIGINAL_MAKECMDGOALS := $(MAKECMDGOALS)



ifdef CALLED_FROM_SETUP

  dist_goal := $(strip $(filter dist,$(MAKECMDGOALS)))

  MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))

  .KATI_READONLY := dist_goal

else

  $(KATI_obsolete_var DIST_DIR dist_goal,Use dist-for-goals instead. See $(CHANGES_URL)#dist)

endif



CHANGES_URL :=



UNAME := $(shell uname -sm)



SRC_TARGET_DIR := $(TOPDIR)build/target

core/ninja_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ endif 
KATI_OUTPUT_PATTERNS := $(OUT_DIR)/build%.ninja $(OUT_DIR)/ninja%.sh



# Modifier goals we don't need to pass to Ninja.

NINJA_EXCLUDE_GOALS := all dist APP-% PRODUCT-%

NINJA_EXCLUDE_GOALS := all APP-% PRODUCT-%



# A list of goals which affect parsing of makefiles and we need to pass to Kati.

PARSE_TIME_MAKE_GOALS := \

core/soong_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -141,8 +141,6 @@ $(call add_json_bool, MinimizeJavaDebugInfo, $(filter true,$(PRODUCT 
$(call add_json_bool, UseGoma,                           $(filter-out false,$(USE_GOMA)))

$(call add_json_bool, Arc,                               $(filter true,$(TARGET_ARC)))



$(call add_json_str,  DistDir,                           $(if $(dist_goal), $(DIST_DIR)))



$(call add_json_list, NamespacesToExport,                $(PRODUCT_SOONG_NAMESPACES))



$(call add_json_list, PgoAdditionalProfileDirs,          $(PGO_ADDITIONAL_PROFILE_DIRS))