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

Commit af80a461 authored by Gaurav Shah's avatar Gaurav Shah Committed by android-build-merger
Browse files

Merge "envsetup,product,ninja: enable symlink traversal" 

am: f589c7b4

* commit 'f589c7b4':
  envsetup,product,ninja: enable symlink traversal
parents 00b8cd9a f589c7b4

core/envsetup.mk

+2 −2
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ SDK_HOST_ARCH := x86 
board_config_mk := \

	$(strip $(sort $(wildcard \

		$(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \

		$(shell test -d device && find device -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \

		$(shell test -d vendor && find vendor -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \

		$(shell test -d device && find -L device -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \

		$(shell test -d vendor && find -L vendor -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \

	)))

ifeq ($(board_config_mk),)

  $(error No config file found for TARGET_DEVICE $(TARGET_DEVICE))

core/ninja.mk

+5 −1
Original line number Diff line number Diff line
@@ -120,9 +120,13 @@ ninja_wrapper: $(KATI_BUILD_NINJA) $(MAKEPARALLEL) 
	@echo Starting build with ninja

	+$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) $(filter-out dist,$(ANDROID_TARGETS)) -C $(TOP) $(NINJA_ARGS)



KATI_FIND_EMULATOR := --use_find_emulator

ifeq ($(KATI_EMULATE_FIND),false)

  KATI_FIND_EMULATOR :=

endif

$(KATI_BUILD_NINJA): $(KATI) $(MAKEPARALLEL) FORCE

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

	+$(hide) $(KATI_MAKEPARALLEL) $(KATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo --use_find_emulator -f build/core/main.mk $(KATI_TARGETS) --gen_all_targets BUILDING_WITH_NINJA=true

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



KATI_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CFLAGS) $(CLANG_HOST_GLOBAL_CPPFLAGS)

KATI_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS)

core/product.mk

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
# $(call ) isn't necessary.

#

define _find-android-products-files

$(sort $(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk)) \

  $(sort $(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk)) \

  $(sort $(shell test -d product && find product -maxdepth 6 -name AndroidProducts.mk)) \

$(sort $(shell test -d device && find -L device -maxdepth 6 -name AndroidProducts.mk)) \

  $(sort $(shell test -d vendor && find -L vendor -maxdepth 6 -name AndroidProducts.mk)) \

  $(sort $(shell test -d product && find -L product -maxdepth 6 -name AndroidProducts.mk)) \

  $(SRC_TARGET_DIR)/product/AndroidProducts.mk

endef