From 52e5d9c7761cc8669c6360f5bfdc11d7de7a3b5f Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 30 Nov 2021 11:24:33 -0800 Subject: [PATCH] Define $(PRODUCT_OUT) before running the board config Certain board configurations reference $(PRODUCT_OUT) through deferred expansion, which will no longer work after conversion to starlark. Bug: 201700692 Test: build/bazel/ci/rbc_regression_test.sh -b yukawa-userdebug Change-Id: I02055f5c4a05e540c1752d5964d4db4306292c3b --- core/envsetup.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index bb1aa1edab..9cc7a0f032 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -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) @@ -349,14 +353,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