openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Include android_soong_config_vars.mk in the make (kati) step." am: 36c1435ec4 

Original change: https://android-review.googlesource.com/c/platform/build/+/1595337

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc7f272e273f54df843650e7e74fcad40a76994a
This commit is contained in:
Treehugger Robot 2021-03-02 19:58:45 +00:00 committed by Automerger Merge Worker
parent f2507339e5 36c1435ec4
commit 7e3f5430a8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/config.mk
View File

@ -1163,8 +1163,11 @@ endif
dont_bother_goals := out \
product-graph dump-products
ifeq ($(CALLED_FROM_SETUP),true)
# Make ANDROID Soong config variables visible to Android.mk files, for
# consistency with those defined in BoardConfig.mk files.
include $(BUILD_SYSTEM)/android_soong_config_vars.mk
ifeq ($(CALLED_FROM_SETUP),true)
include $(BUILD_SYSTEM)/ninja_config.mk
include $(BUILD_SYSTEM)/soong_config.mk
endif