Merge "Define $(PRODUCT_OUT) before running the board config" (91187683) · Commits · e / os / android_build

core/envsetup.mk

+8 −8

Original line number	Diff line number	Diff line
		@@ -323,6 +323,12 @@ endif
		SDK_HOST_ARCH := x86
		TARGET_OS := linux

		# Some board configuration files use $(PRODUCT_OUT)
		TARGET_OUT_ROOT := $(OUT_DIR)/target
		TARGET_PRODUCT_OUT_ROOT := $(TARGET_OUT_ROOT)/product
		PRODUCT_OUT := $(TARGET_PRODUCT_OUT_ROOT)/$(TARGET_DEVICE)
		.KATI_READONLY := TARGET_OUT_ROOT TARGET_PRODUCT_OUT_ROOT PRODUCT_OUT

		include $(BUILD_SYSTEM)/board_config.mk

		# the target build type defaults to release
		@@ -335,11 +341,9 @@ endif

		SOONG_OUT_DIR := $(OUT_DIR)/soong

		TARGET_OUT_ROOT := $(OUT_DIR)/target

		HOST_OUT_ROOT := $(OUT_DIR)/host

		.KATI_READONLY := SOONG_OUT_DIR TARGET_OUT_ROOT HOST_OUT_ROOT
		.KATI_READONLY := SOONG_OUT_DIR HOST_OUT_ROOT

		# We want to avoid two host bin directories in multilib build.
		HOST_OUT := $(HOST_OUT_ROOT)/$(HOST_OS)-$(HOST_PREBUILT_ARCH)
		@@ -351,14 +355,10 @@ HOST_CROSS_OUT := $(HOST_OUT_ROOT)/$(HOST_CROSS_OS)-$(HOST_CROSS_ARCH)

		.KATI_READONLY := HOST_OUT SOONG_HOST_OUT HOST_CROSS_OUT

		TARGET_PRODUCT_OUT_ROOT := $(TARGET_OUT_ROOT)/product

		TARGET_COMMON_OUT_ROOT := $(TARGET_OUT_ROOT)/common
		HOST_COMMON_OUT_ROOT := $(HOST_OUT_ROOT)/common

		PRODUCT_OUT := $(TARGET_PRODUCT_OUT_ROOT)/$(TARGET_DEVICE)

		.KATI_READONLY := TARGET_PRODUCT_OUT_ROOT TARGET_COMMON_OUT_ROOT HOST_COMMON_OUT_ROOT PRODUCT_OUT
		.KATI_READONLY := TARGET_COMMON_OUT_ROOT HOST_COMMON_OUT_ROOT

		OUT_DOCS := $(TARGET_COMMON_OUT_ROOT)/docs
		OUT_NDK_DOCS := $(TARGET_COMMON_OUT_ROOT)/ndk-docs