Merge "Accept TARGET_DEVICE_DIR preserved from previous product load" (79babfac) · Commits · e / os / android_build

core/config.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,11 @@ SRC_TEST_API_DIR := $(TOPDIR)prebuilts/sdk/test-api
		# Some specific paths to tools
		SRC_DROIDDOC_DIR := $(TOPDIR)build/make/tools/droiddoc

		# Mark some inputs as readonly
		ifdef TARGET_DEVICE_DIR
		.KATI_READONLY := TARGET_DEVICE_DIR
		endif

		# Set up efficient math functions which are used in make.
		# Here since this file is included by envsetup as well as during build.
		include $(BUILD_SYSTEM)/math.mk

+20 −12

Original line number	Diff line number	Diff line
		@@ -241,6 +241,12 @@ SDK_HOST_ARCH := x86
		# or under vendor/*/$(TARGET_DEVICE). Search in both places, but
		# make sure only one exists.
		# Real boards should always be associated with an OEM vendor.
		ifdef TARGET_DEVICE_DIR
		ifneq ($(origin TARGET_DEVICE_DIR),command line)
		$(error TARGET_DEVICE_DIR may not be set manually)
		endif
		board_config_mk := $(TARGET_DEVICE_DIR)/BoardConfig.mk
		else
		board_config_mk := \
		$(strip $(sort $(wildcard \
		$(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \
		@@ -253,6 +259,9 @@ endif
		ifneq ($(words $(board_config_mk)),1)
		$(error Multiple board config files for TARGET_DEVICE $(TARGET_DEVICE): $(board_config_mk))
		endif
		TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))
		.KATI_READONLY := TARGET_DEVICE_DIR
		endif
		include $(board_config_mk)
		ifeq ($(TARGET_ARCH),)
		$(error TARGET_ARCH not defined by board config: $(board_config_mk))
		@@ -261,7 +270,6 @@ ifneq ($(MALLOC_IMPL),)
		$(warning *** Unsupported option MALLOC_IMPL defined by board config: $(board_config_mk).)
		$(error Use `MALLOC_SVELTE := true` to configure jemalloc for low-memory)
		endif
		TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))
		board_config_mk :=

		###########################################