commit d1aa1cdf44ec24df9d658b49fd442144acb71fed
author Kiyoung Kim <kiyoungkim@google.com> Mon Apr 24 17:07:55 2023 +0900
committer Kiyoung Kim <kiyoungkim@google.com> Sun May 14 11:57:16 2023 +0000
tree 2c5729b9a2c477e02a8802d5accc9f17f375d99f
parent b87fd7333019543bfde17533a1defad160ce1598

Rename soong.variable with target product

Bug: 277029044
Test: build succeeded and checked if out/soong/soong.variable has been
renamed

Change-Id: I035a52f3d8ad80d9e44a55e10fe537556ddecda8

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 034d044..f18b8d2 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -1,5 +1,5 @@
 SOONG_MAKEVARS_MK := $(SOONG_OUT_DIR)/make_vars-$(TARGET_PRODUCT).mk
-SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.variables
+SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT).variables
 SOONG_ANDROID_MK := $(SOONG_OUT_DIR)/Android-$(TARGET_PRODUCT).mk
 
 include $(BUILD_SYSTEM)/art_config.mk